aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-30 20:36:11 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-31 17:15:31 +0100
commit810a14dbcc655c26abe49b690aabfe6c311bc769 (patch)
treeb85dcb71cfa1b7cbe489f701ab589bdb09a2800f
parentf69a766d11e60cb11b45cee5a397db96bb8cf66e (diff)
downloadffmpeg-810a14dbcc655c26abe49b690aabfe6c311bc769.tar.gz
aacdec: Evaluate further PCE elements.
Fixes Music\ Station\ Super\ Live\ -\ 2011.12.23.mkv Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/aacdec.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 030feb1371..c0798429af 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2201,10 +2201,11 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
if ((err = decode_pce(avctx, &ac->m4ac, new_che_pos, gb)))
break;
if (ac->output_configured > OC_TRIAL_PCE)
- av_log(avctx, AV_LOG_ERROR,
- "Not evaluating a further program_config_element as this construct is dubious at best.\n");
- else
- err = output_configure(ac, ac->che_pos, new_che_pos, 0, OC_TRIAL_PCE);
+ av_log(avctx, AV_LOG_INFO,
+ "Evaluating a further program_config_element.\n");
+ err = output_configure(ac, ac->che_pos, new_che_pos, 0, OC_TRIAL_PCE);
+ if (!err)
+ ac->m4ac.chan_config = 0;
break;
}