]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Require 4 instead of 3 frames for detecting mp3,
authormichael <michael@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Wed, 22 Apr 2009 02:58:20 +0000 (02:58 +0000)
committermichael <michael@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Wed, 22 Apr 2009 02:58:20 +0000 (02:58 +0000)
fixes misdetection of mpegps_mp3_unrecognized_format.mpg (issue997)

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18657 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavformat/mp3.c

index b032f0c09e666ed48300adcf4a6397ceb7f51a8d..e835a3442420061f0ea5c11325b93ccefaf3cdf5 100644 (file)
@@ -391,10 +391,11 @@ static int mp3_read_probe(AVProbeData *p)
     }
     if   (first_frames>=3) return AVPROBE_SCORE_MAX/2+1;
     else if(max_frames>500)return AVPROBE_SCORE_MAX/2;
-    else if(max_frames>=3) return AVPROBE_SCORE_MAX/4;
+    else if(max_frames>=4) return AVPROBE_SCORE_MAX/4;
     else if(buf0!=p->buf)  return AVPROBE_SCORE_MAX/4-1;
     else if(max_frames>=1) return 1;
     else                   return 0;
+//mpegps_mp3_unrecognized_format.mpg has max_frames=3
 }
 
 /**