diff options
| author | Alex Converse <alex.converse@gmail.com> | 2017-02-16 13:08:31 -0800 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2017-02-21 15:12:16 -0800 |
| commit | dde1bf074ca6147893d1dbf4216848b7e455a9a9 (patch) | |
| tree | 4bb386f2b453e703375e41d0b572a98801dc8f5c /libavcodec | |
| parent | 2ac381088d05d377a97e7e6900cf6e9c0375df0f (diff) | |
| download | ffmpeg-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')
| -rw-r--r-- | libavcodec/aacdec_template.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) |