Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / mpegvideodec.c

diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c
index d146b1a8293e336706389bbcce260cf150932e27..11e4bd70e836428a47be2809d0391b8b6323e347 100644 (file)
--- a/libavformat/mpegvideodec.c
+++ b/libavformat/mpegvideodec.c
@@ -43,15 +43,16 @@ static int mpegvideo_probe(AVProbeData *p)
             switch(code){
             case     SEQ_START_CODE:   seq++; break;
             case PICTURE_START_CODE:   pic++; break;
-            case   SLICE_START_CODE...0x1af: slice++; break;
             case    PACK_START_CODE: pspack++; break;
             }
+            if (code >= SLICE_START_CODE && code <= 0x1af) slice++;
             if     ((code & 0x1f0) == VIDEO_ID)   vpes++;
             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)
+        if(vpes) return AVPROBE_SCORE_MAX/8;
+        else     return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
     return 0;
 }