[SCM] libav/experimental: adjust output channels based on AVCodecContext.request_channels in AC3 parser
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:11:18 UTC 2013
The following commit has been merged in the experimental branch:
commit f228eb737b6cb92a476e41ca68429455962d3681
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Sat Jan 5 05:36:00 2008 +0000
adjust output channels based on AVCodecContext.request_channels in AC3 parser
Originally committed as revision 11412 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index c5d7c8a..46824fb 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -61,6 +61,13 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
/* update codec info */
avctx->sample_rate = sample_rate;
avctx->channels = channels;
+ /* allow downmixing to mono or stereo for AC3 */
+ if(avctx->request_channels > 0 &&
+ avctx->request_channels < channels &&
+ avctx->request_channels <= 2 &&
+ avctx->codec_id == CODEC_ID_AC3) {
+ avctx->channels = avctx->request_channels;
+ }
avctx->bit_rate = bit_rate;
avctx->frame_size = samples;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list