aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-17 18:47:36 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-17 18:49:08 +0100
commitf96a653184e63cea91e08ea75ae60d309e431f40 (patch)
treeb99e99a1c5fb54585e9221cc696560b66cd69ca7
parent63ac64864c6e0e84355aa3caa5b92208997a9a8d (diff)
downloadffmpeg-f96a653184e63cea91e08ea75ae60d309e431f40.tar.gz
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>
-rw-r--r--libavformat/flvdec.c2
1 files changed, 1 insertions, 1 deletions
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) {