From a8bc175dd9cec09c1cbdc6e5e3bf8f59170162da Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 12 May 2014 21:02:06 +0200 Subject: avformat/mp3dec: check the number of frames per buffer size Fixes misdetection of issue3327-libc-2.17.so Signed-off-by: Michael Niedermayer --- libavformat/mp3dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/mp3dec.c') diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index e04206c991..8335388409 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -90,10 +90,10 @@ static int mp3_read_probe(AVProbeData *p) // issues with MPEG-files! if (first_frames>=4) return AVPROBE_SCORE_EXTENSION + 1; else if(max_frames>200)return AVPROBE_SCORE_EXTENSION; - else if(max_frames>=4) return AVPROBE_SCORE_EXTENSION / 2; + else if(max_frames>=4 && max_frames >= p->buf_size/10000) 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; - else if(max_frames>=1) return 1; + else if(max_frames>=1 && max_frames >= p->buf_size/10000) return 1; else return 0; //mpegps_mp3_unrecognized_format.mpg has max_frames=3 } -- cgit v1.2.3