Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / mpegvideodec.c

diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c
index d38d6955e4ecad655717b3f3d7c5cca4f3cce52e..11e4bd70e836428a47be2809d0391b8b6323e347 100644 (file)
--- a/libavformat/mpegvideodec.c
+++ b/libavformat/mpegvideodec.c
@@ -34,7 +34,7 @@
 static int mpegvideo_probe(AVProbeData *p)
 {
     uint32_t code= -1;
-    int pic=0, seq=0, slice=0, pspack=0, pes=0;
+    int pic=0, seq=0, slice=0, pspack=0, vpes=0, apes=0;
     int i;
 
     for(i=0; i<p->buf_size; i++){
@@ -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: slice++; break;
             case    PACK_START_CODE: pspack++; break;
             }
-            if     ((code & 0x1f0) == VIDEO_ID)   pes++;
-            else if((code & 0x1e0) == AUDIO_ID)   pes++;
+            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 && !pes)
-        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;
 }