diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-30 17:20:45 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-30 17:20:45 -0300 |
| commit | 34542ac033f81601fd4dd684e993cc1716bb9a4d (patch) | |
| tree | 06aa634cdc41b96b0f7bfc97f634ab73f1bcd99f /libavcodec/mlp_parser.h | |
| parent | 9484b9f4ba66a96b9b565f33f1eeb6e9b9b79e96 (diff) | |
| parent | 970c76f32283bddf3a5afd24fe52db7a96186244 (diff) | |
| download | ffmpeg-34542ac033f81601fd4dd684e993cc1716bb9a4d.tar.gz | |
Merge commit '970c76f32283bddf3a5afd24fe52db7a96186244'
* commit '970c76f32283bddf3a5afd24fe52db7a96186244':
mlp_parser: Drop in-parser downmix functionality
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/mlp_parser.h')
| -rw-r--r-- | libavcodec/mlp_parser.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h index 79c4efdb9a..c5a2883920 100644 --- a/libavcodec/mlp_parser.h +++ b/libavcodec/mlp_parser.h @@ -68,6 +68,4 @@ uint64_t ff_truehd_layout(int chanmap); extern const uint64_t ff_mlp_layout[32]; -int ff_mlp_channel_layout_subset(uint64_t channel_layout, uint64_t mask); - #endif /* AVCODEC_MLP_PARSER_H */ |