diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-09-15 13:27:13 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-09-15 13:27:13 +0000 |
| commit | 2a3caca2b123b39eb718b434e067729a1544e1db (patch) | |
| tree | ba7568d7b9cb6f3e9bbf448871d1f7aca57f2594 /libavformat | |
| parent | ff19d438dc6950a4fd6e1004b331c1aca4236c58 (diff) | |
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
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/raw.c b/libavformat/raw.c index 3a53eee527..f807a96f31 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; |