diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-05-12 18:33:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-05-20 13:17:36 +0200 |
| commit | 81b3e7c9c3ad0cb81c49ad7557041e4cd04bab58 (patch) | |
| tree | 8c339a1a06a651fdb9f92836aee334abd3af674a /libavformat/mp3dec.c | |
| parent | 60d179277972f2ab12ade0603e72f1eee9d15de8 (diff) | |
| download | ffmpeg-81b3e7c9c3ad0cb81c49ad7557041e4cd04bab58.tar.gz | |
avformat/mp3dec: Require 50% of the file to be mp3 frames in the maxframes>200 probing test
This corrects several misdetections of large files
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mp3dec.c')
| -rw-r--r-- | libavformat/mp3dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index a26714ebaf..d419f8c9fe 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -107,7 +107,7 @@ static int mp3_read_probe(AVProbeData *p) // keep this in sync with ac3 probe, both need to avoid // issues with MPEG-files! if (first_frames>=7) return AVPROBE_SCORE_EXTENSION + 1; - else if(max_frames>200)return AVPROBE_SCORE_EXTENSION; + else if(max_frames>200 && p->buf_size < 2*max_framesizes)return AVPROBE_SCORE_EXTENSION; else if(max_frames>=4 && p->buf_size < 2*max_framesizes) return AVPROBE_SCORE_EXTENSION / 2; else if(ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC) && 2*ff_id3v2_tag_len(buf0) >= p->buf_size) return p->buf_size < PROBE_BUF_MAX ? AVPROBE_SCORE_EXTENSION / 4 : AVPROBE_SCORE_EXTENSION - 2; |