From 43886eaebc8e803a2f90051afd03068be47e398f Mon Sep 17 00:00:00 2001
From: Alex Converse <alex.converse@gmail.com>
Date: Tue, 19 Jun 2012 19:06:34 -0700
Subject: [PATCH] aacdec: Fix popping channel layouts.

'channel_layout' not 'channels' from the stored configuration should go
to AVCodecContext's 'channel_layout'.
---
 libavcodec/aacdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 3cf4a7fe18..f16b831ccd 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;
     }
 }