[FFmpeg-cvslog] r18657 - trunk/libavformat/mp3.c

michael subversion
Wed Apr 22 04:58:21 CEST 2009


Author: michael
Date: Wed Apr 22 04:58:20 2009
New Revision: 18657

Log:
Require 4 instead of 3 frames for detecting mp3,
fixes misdetection of mpegps_mp3_unrecognized_format.mpg (issue997)

Modified:
   trunk/libavformat/mp3.c

Modified: trunk/libavformat/mp3.c
==============================================================================
--- trunk/libavformat/mp3.c	Wed Apr 22 04:29:11 2009	(r18656)
+++ trunk/libavformat/mp3.c	Wed Apr 22 04:58:20 2009	(r18657)
@@ -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
 }
 
 /**



More information about the ffmpeg-cvslog mailing list