diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-05-25 09:43:14 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-05-25 09:49:18 +0200 |
| commit | 06fd213eb608c23f58e290cfad6262b94e30fc74 (patch) | |
| tree | cab19f94a680c121ffa04cb11534fedca018ef72 | |
| parent | ecf72542fac6d05d88efe4a7a474adb8ec291fbe (diff) | |
| download | ffmpeg-06fd213eb608c23f58e290cfad6262b94e30fc74.tar.gz | |
Do not reset channel_layout to 0.
The channel_layout may have been set by the demuxer.
| -rw-r--r-- | libavcodec/aacdec.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index c56c0af986..19d3b3678f 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -251,8 +251,6 @@ static av_cold int output_configure(AACContext *ac, } memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0])); - - avctx->channel_layout = 0; } avctx->channels = channels; |