From dde1bf074ca6147893d1dbf4216848b7e455a9a9 Mon Sep 17 00:00:00 2001
From: Alex Converse <alex.converse@gmail.com>
Date: Thu, 16 Feb 2017 13:08:31 -0800
Subject: aacdec: When ignoring a PCE restore the previous config

This is related to, but doesn't solve ticker 6152.
---
 libavcodec/aacdec_template.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 4e0a9529e1..4367e74cf7 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)
-- 
cgit v1.2.3