Merge commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f'

[ffmpeg] / libavformat / mp3dec.c

diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index d599c9c489cf057de0aab13cb26537469c72ad42..644ffe4b4c25a3640c5aef3a9b0c2f581000a67b 100644 (file)
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -76,11 +76,11 @@ 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>=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;
+    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(ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC) && 2*ff_id3v2_tag_len(buf0) >= p->buf_size)
-                           return AVPROBE_SCORE_MAX/8;
+                           return AVPROBE_SCORE_EXTENSION / 4;
     else if(max_frames>=1) return 1;
     else                   return 0;
 //mpegps_mp3_unrecognized_format.mpg has max_frames=3