[SCM] libav/experimental: Make h261 and mpegvideo probe a little more robust so they dont fail with slightly different probetest.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2a3caca2b123b39eb718b434e067729a1544e1db
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Sep 15 13:27:13 2009 +0000

    Make h261 and mpegvideo probe a little more robust so they dont fail with
    slightly different probetest.
    
    Originally committed as revision 19856 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/raw.c b/libavformat/raw.c
index 3a53eee..f807a96 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -326,7 +326,7 @@ static int mpegvideo_probe(AVProbeData *p)
         }
     }
     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;

-- 
Libav/FFmpeg packaging