diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-18 02:50:18 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-18 02:50:18 +0400 |
commit | 68526dbc29473ec5820f7bb21e00204bb18b698e (patch) | |
tree | f773f4ad2596c136a90e15c855f73646d5a50880 /libavcodec/aacdec.c | |
parent | 123272374180d8dc3ce9dff50f0c77d5b3b3341f (diff) |
aacdec: reduce difference to alexs version of aacdec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
-rw-r--r-- | libavcodec/aacdec.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 4725343bfd..12c2b4a8b6 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2451,13 +2451,15 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, break; } if (pce_found) { - av_log(avctx, AV_LOG_INFO, - "Evaluating a further program_config_element.\n"); + 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, 0, OC_TRIAL_PCE); + if (!err) + ac->oc[1].m4ac.chan_config = 0; + pce_found = 1; } - err = output_configure(ac, layout_map, tags, 0, OC_TRIAL_PCE); - if (!err) - ac->oc[1].m4ac.chan_config = 0; - pce_found = 1; break; } |