[FFmpeg-cvslog] Do not reset channel_layout to 0.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed May 25 09:43:14 2011 +0200| [06fd213eb608c23f58e290cfad6262b94e30fc74] | committer: Carl Eugen Hoyos

Do not reset channel_layout to 0.

The channel_layout may have been set by the demuxer.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06fd213eb608c23f58e290cfad6262b94e30fc74
---

 libavcodec/aacdec.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index c56c0af..19d3b36 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;