[Ffmpeg-cvslog] r6304 - trunk/libavformat/mp3.c

[michael]

Author: michael
Date: Wed Sep 20 23:23:32 2006
New Revision: 6304

Modified:
   trunk/libavformat/mp3.c

Log:
reduce scores if the mp3 frames dont start from the begin of the file (fixes flv deteted as mp3 issues)


Modified: trunk/libavformat/mp3.c
==============================================================================
--- trunk/libavformat/mp3.c	(original)
+++ trunk/libavformat/mp3.c	Wed Sep 20 23:23:32 2006
@@ -244,7 +244,7 @@
 
 static int mp3_read_probe(AVProbeData *p)
 {
-    int max_frames;
+    int max_frames, first_frames;
     int fsize, frames;
     uint32_t header;
     uint8_t *buf, *buf2, *end;
@@ -271,10 +271,12 @@
             buf2 += fsize;
         }
         max_frames = FFMAX(max_frames, frames);
+        if(buf == p->buf)
+            first_frames= frames;
     }
-    if     (max_frames>=3) return AVPROBE_SCORE_MAX/2+1;
-    else if(max_frames==2) return AVPROBE_SCORE_MAX/4;
-    else if(max_frames==1) return 1;
+    if   (first_frames>=3) return AVPROBE_SCORE_MAX/2+1;
+    else if(max_frames>=3) return AVPROBE_SCORE_MAX/4;
+    else if(max_frames>=1) return 1;
     else                   return 0;
 }