summaryrefslogtreecommitdiffstats
path: root/libavcodec/aacdec_template.c
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2017-02-16 13:08:31 -0800
committerAlex Converse <alex.converse@gmail.com>2017-02-21 15:12:16 -0800
commitdde1bf074ca6147893d1dbf4216848b7e455a9a9 (patch)
tree4bb386f2b453e703375e41d0b572a98801dc8f5c /libavcodec/aacdec_template.c
parent2ac381088d05d377a97e7e6900cf6e9c0375df0f (diff)
downloadffmpeg-streaming-dde1bf074ca6147893d1dbf4216848b7e455a9a9.zip
ffmpeg-streaming-dde1bf074ca6147893d1dbf4216848b7e455a9a9.tar.gz
aacdec: When ignoring a PCE restore the previous config
This is related to, but doesn't solve ticker 6152.
Diffstat (limited to 'libavcodec/aacdec_template.c')
-rw-r--r--libavcodec/aacdec_template.c1
1 files changed, 1 insertions, 0 deletions
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)
OpenPOWER on IntegriCloud