From 810a14dbcc655c26abe49b690aabfe6c311bc769 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 30 Dec 2011 20:36:11 +0100 Subject: aacdec: Evaluate further PCE elements. Fixes Music\ Station\ Super\ Live\ -\ 2011.12.23.mkv Signed-off-by: Michael Niedermayer --- libavcodec/aacdec.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libavcodec/aacdec.c') 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; } -- cgit v1.2.3