From 970c76f32283bddf3a5afd24fe52db7a96186244 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara <vittorio.giovara@gmail.com> Date: Wed, 26 Apr 2017 11:08:17 -0400 Subject: mlp_parser: Drop in-parser downmix functionality request_channel_layout is a decoder option and it makes no sense to have it in a parser. This feature was needed in the past when the decoder was allowed to reuse the avctx from the demuxer. Nowadays the decoder receives only the parameters from it, already containing the real channel layout (and the correct request_channel_layout option). After initialization the decoder overwrites the channel layout with the downmixed one that is actually output, so there is no need to preserve this functionality in the parser. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> --- libavcodec/mlp_parser.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'libavcodec/mlp_parser.h') diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h index 946f4d240c..871b96db20 100644 --- a/libavcodec/mlp_parser.h +++ b/libavcodec/mlp_parser.h @@ -63,6 +63,4 @@ typedef struct MLPHeaderInfo int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, BitstreamContext *bc); -int ff_mlp_channel_layout_subset(uint64_t channel_layout, uint64_t mask); - #endif /* AVCODEC_MLP_PARSER_H */ -- cgit v1.2.3