git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2ac3810
)
aacdec: When ignoring a PCE restore the previous config
author
Alex Converse
<alex.converse@gmail.com>
Thu, 16 Feb 2017 21:08:31 +0000
(13:08 -0800)
committer
Alex Converse
<alex.converse@gmail.com>
Tue, 21 Feb 2017 23:12:16 +0000
(15:12 -0800)
This is related to, but doesn't solve ticker 6152.
libavcodec/aacdec_template.c
patch
|
blob
|
history
diff --git
a/libavcodec/aacdec_template.c
b/libavcodec/aacdec_template.c
index
4e0a952
..
4367e74
100644
(file)
--- 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)