diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2008-01-05 21:08:20 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2008-01-05 21:08:20 +0000 |
| commit | ef7f2bb782de8758afa2d8d1456da8148c38bb65 (patch) | |
| tree | 2eb44027cf8367e71172b058e60e718621d25715 /libavcodec/aac_ac3_parser.c | |
| parent | 1d8cfa316884cac0926c64450d3a9db383eab950 (diff) | |
| download | ffmpeg-ef7f2bb782de8758afa2d8d1456da8148c38bb65.tar.gz | |
add downmixing support to libfaad decoder
Originally committed as revision 11422 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac_ac3_parser.c')
| -rw-r--r-- | libavcodec/aac_ac3_parser.c | 7 |
1 files changed, 4 insertions, 3 deletions
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; |