[FFmpeg-cvslog] aac: reconfigure output on pop

[Michael Niedermayer]

ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 22 17:33:22 2013 +0100| [97a740acc58792bf296f7f8b5ee3253fa8a48f0c] | committer: Michael Niedermayer

aac: reconfigure output on pop

Fixes Ticket1918

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 6f77122bf5712da1d860a0ad7174181fd0bcffd9)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/aacdec.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 34cc18b..4f0cf4b 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -112,6 +112,10 @@
 static VLC vlc_scalefactors;
 static VLC vlc_spectral[11];
 
+static int output_configure(AACContext *ac,
+                            uint8_t layout_map[MAX_ELEM_ID*4][3], int tags,
+                            int channel_config, enum OCStatus oc_type);
+
 #define overread_err "Input buffer exhausted before END element found\n"
 
 static int count_channels(uint8_t (*layout)[3], int tags)
@@ -373,6 +377,8 @@ static void pop_output_configuration(AACContext *ac) {
         ac->oc[1] = ac->oc[0];
         ac->avctx->channels = ac->oc[1].channels;
         ac->avctx->channel_layout = ac->oc[1].channel_layout;
+        output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags,
+                         ac->oc[1].m4ac.chan_config, ac->oc[1].status);
     }
 }