[FFmpeg-cvslog] aacdec: dont pop random configurations

Michael Niedermayer git at videolan.org
Fri Feb 22 14:52:55 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 22 13:51:39 2013 +0100| [21f68528e39db68fd3e22fef8f4783d19034dc1d] | committer: Michael Niedermayer

aacdec: dont pop random configurations

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/aacdec.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 6482787..880a38e 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2554,7 +2554,6 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
             if (pce_found) {
                 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, OC_TRIAL_PCE, 1);
                 if (!err)



More information about the ffmpeg-cvslog mailing list