From f96a653184e63cea91e08ea75ae60d309e431f40 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 17 Nov 2012 18:47:36 +0100
Subject: [PATCH] flvdec: disable hack that attempts to parse aac bitstream in
 the flv demuxer.

I was unable to find a file that needs this hack, if you have one please
contact us!
Fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 libavformat/flvdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 5bcc3fe2f3..09a77c4852 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -822,7 +822,7 @@ retry_duration:
             }
             if ((ret = flv_get_extradata(s, st, size)) < 0)
                 return ret;
-            if (st->codec->codec_id == AV_CODEC_ID_AAC) {
+            if (st->codec->codec_id == AV_CODEC_ID_AAC && 0) {
                 MPEG4AudioConfig cfg;
                 if (avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata,
                                              st->codec->extradata_size * 8, 1) >= 0) {