[FFmpeg-cvslog] aacdec: reduce difference to alexs version of aacdec.c

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 18 00:50:18 2012 +0200| [68526dbc29473ec5820f7bb21e00204bb18b698e] | committer: Michael Niedermayer

aacdec: reduce difference to alexs version of aacdec.c

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68526dbc29473ec5820f7bb21e00204bb18b698e
---

 libavcodec/aacdec.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 4725343..12c2b4a 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;
         }