[FFmpeg-cvslog] r19856 - trunk/libavformat/raw.c

[michael]

Author: michael
Date: Tue Sep 15 15:27:13 2009
New Revision: 19856

Log:
Make h261 and mpegvideo probe a little more robust so they dont fail with
slightly different probetest.

Modified:
   trunk/libavformat/raw.c

Modified: trunk/libavformat/raw.c
==============================================================================
--- trunk/libavformat/raw.c	Tue Sep 15 15:09:34 2009	(r19855)
+++ trunk/libavformat/raw.c	Tue Sep 15 15:27:13 2009	(r19856)
@@ -326,7 +326,7 @@ static int mpegvideo_probe(AVProbeData *
         }
     }
     if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !pes)
-        return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg
+        return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
     return 0;
 }
 #endif
@@ -515,7 +515,7 @@ static int h261_probe(AVProbeData *p)
             }
         }
     }
-    if(valid_psc > 2*invalid_psc + 4){
+    if(valid_psc > 2*invalid_psc + 6){
         return 50;
     }else if(valid_psc > 2*invalid_psc + 2)
         return 25;