From ef7f2bb782de8758afa2d8d1456da8148c38bb65 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sat, 5 Jan 2008 21:08:20 +0000 Subject: add downmixing support to libfaad decoder Originally committed as revision 11422 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aac_ac3_parser.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libavcodec/aac_ac3_parser.c') diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 8a83aae115..999a189158 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -60,11 +60,12 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1, s->frame_size = len; /* update codec info */ avctx->sample_rate = sample_rate; - /* allow downmixing to mono or stereo for AC3 */ + /* allow downmixing to stereo (or mono for AC3) */ if(avctx->request_channels > 0 && avctx->request_channels < channels && - avctx->request_channels <= 2 && - avctx->codec_id == CODEC_ID_AC3) { + (avctx->request_channels <= 2 || + (avctx->request_channels == 1 && + avctx->codec_id == CODEC_ID_AC3))) { avctx->channels = avctx->request_channels; } else { avctx->channels = channels; -- cgit v1.2.3