[FFmpeg-cvslog] mpegvideo_probe: dont be too picky on spec compliance and the lack of system startcodes.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  8 20:29:39 2011 +0100| [0643ff1712bd5fa063c230ae451a7da345d21575] | committer: Michael Niedermayer

mpegvideo_probe: dont be too picky on spec compliance and the lack of system startcodes.
Fixes Ticket620

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0643ff1712bd5fa063c230ae451a7da345d21575
---

 libavformat/mpegvideodec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c
index d146b1a..1b057bd 100644
--- a/libavformat/mpegvideodec.c
+++ b/libavformat/mpegvideodec.c
@@ -50,8 +50,8 @@ static int mpegvideo_probe(AVProbeData *p)
             else if((code & 0x1e0) == AUDIO_ID)   apes++;
         }
     }
-    if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !apes && !vpes)
-        return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
+    if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !apes)
+        return (pic>1 && !vpes) ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
     return 0;
 }