[FFmpeg-cvslog] aacdec: When ignoring a PCE restore the previous config

[Alex Converse]

ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Thu Feb 16 13:08:31 2017 -0800| [dde1bf074ca6147893d1dbf4216848b7e455a9a9] | committer: Alex Converse

aacdec: When ignoring a PCE restore the previous config

This is related to, but doesn't solve ticker 6152.

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

 libavcodec/aacdec_template.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 4e0a952..4367e74 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -3036,6 +3036,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
             if (pce_found) {
                 av_log(avctx, AV_LOG_ERROR,
                        "Not evaluating a further program_config_element as this construct is dubious at best.\n");
+                pop_output_configuration(ac);
             } else {
                 err = output_configure(ac, layout_map, tags, OC_TRIAL_PCE, 1);
                 if (!err)