aacdec: reduce difference to alexs version of aacdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago · 68526dbc29
parent 1232723741
commit 68526dbc29
1 changed files with 8 additions and 6 deletions
--- 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;
        }