Commit 6b1abb87 authored by michael's avatar michael

Make h261 and mpegvideo probe a little more robust so they dont fail with

slightly different probetest.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19856 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 87218163
...@@ -326,7 +326,7 @@ static int mpegvideo_probe(AVProbeData *p) ...@@ -326,7 +326,7 @@ static int mpegvideo_probe(AVProbeData *p)
} }
} }
if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !pes) 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; return 0;
} }
#endif #endif
...@@ -515,7 +515,7 @@ static int h261_probe(AVProbeData *p) ...@@ -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; return 50;
}else if(valid_psc > 2*invalid_psc + 2) }else if(valid_psc > 2*invalid_psc + 2)
return 25; return 25;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment