aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-19 20:41:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-19 20:49:04 +0100
commit2b07f572af65aa411a24e87348671fad7cd10fe9 (patch)
tree21138e21fe653f76ef346790146f3933d0316ace
parente19ccc89ef90dcc8ecc5e3e539761a6a6eccbcef (diff)
downloadffmpeg-2b07f572af65aa411a24e87348671fad7cd10fe9.tar.gz
mp3_probe: consider id3 tags to be low scoring mp3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/mp3dec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index f3079e3116..8aa157c53d 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -66,6 +66,8 @@ static int mp3_read_probe(AVProbeData *p)
if (first_frames>=4) return AVPROBE_SCORE_MAX/2+1;
else if(max_frames>200)return AVPROBE_SCORE_MAX/2;
else if(max_frames>=4) return AVPROBE_SCORE_MAX/4;
+ else if(ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC) && 2*ff_id3v2_tag_len(buf0) >= p->buf_size)
+ return AVPROBE_SCORE_MAX/8;
else if(max_frames>=1) return 1;
else return 0;
//mpegps_mp3_unrecognized_format.mpg has max_frames=3