diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2008-01-05 15:18:15 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2008-01-05 15:18:15 +0000 |
| commit | 6cd325c1064c80f47b596f3b2bea24f227b198f2 (patch) | |
| tree | 7d1d1a80a407ec1f2e012e61aad776143aa40f9a /libavcodec/aac_ac3_parser.c | |
| parent | 296cbe5728efc9fef8df42e26424fd86fd5e6f8f (diff) | |
| download | ffmpeg-6cd325c1064c80f47b596f3b2bea24f227b198f2.tar.gz | |
do not set channels before checking request_channels
Originally committed as revision 11414 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac_ac3_parser.c')
| -rw-r--r-- | libavcodec/aac_ac3_parser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 46824fbbda..8a83aae115 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -60,13 +60,14 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1, s->frame_size = len; /* 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; + } else { + avctx->channels = channels; } avctx->bit_rate = bit_rate; avctx->frame_size = samples; |