[FFmpeg-cvslog] aacdec: Fix popping channel layouts.

[Alex Converse]

ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Tue Jun 19 19:06:34 2012 -0700| [43886eaebc8e803a2f90051afd03068be47e398f] | committer: Alex Converse

aacdec: Fix popping channel layouts.

'channel_layout' not 'channels' from the stored configuration should go
to AVCodecContext's 'channel_layout'.

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

 libavcodec/aacdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 3cf4a7f..f16b831 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -368,7 +368,7 @@ static void pop_output_configuration(AACContext *ac) {
     if (ac->oc[1].status != OC_LOCKED) {
         ac->oc[1] = ac->oc[0];
         ac->avctx->channels = ac->oc[1].channels;
-        ac->avctx->channel_layout = ac->oc[1].channels;
+        ac->avctx->channel_layout = ac->oc[1].channel_layout;
     }
 }