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
This commit is contained in:
Michael Niedermayer 2009-09-15 13:27:13 +00:00
parent ff19d438dc
commit 2a3caca2b1

View File

@ -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;