X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavformat%2Fm4vdec.c;h=220daeb77516f4c4d972a61a467db331b01ca41e;hb=9461e7d3a598e78811146b730db68d3a5b2532b0;hp=34d434f7d26e5cdd9f7407ca3949724bf685897d;hpb=ab6edb173b365d9a787c2df3a45e3a018d7843d7;p=ffmpeg

diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c
index 34d434f7d26..220daeb7751 100644
--- a/libavformat/m4vdec.c
+++ b/libavformat/m4vdec.c
@@ -22,13 +22,19 @@
 #include "avformat.h"
 #include "rawdec.h"
 
-#define VISUAL_OBJECT_START_CODE       0x000001b5
-#define VOP_START_CODE                 0x000001b6
+#define VOS_STARTCODE        0x1B0
+#define USER_DATA_STARTCODE  0x1B2
+#define GOP_STARTCODE        0x1B3
+#define VISUAL_OBJ_STARTCODE 0x1B5
+#define VOP_STARTCODE        0x1B6
+#define SLICE_STARTCODE      0x1B7
+#define EXT_STARTCODE        0x1B8
 
 static int mpeg4video_probe(AVProbeData *probe_packet)
 {
     uint32_t temp_buffer = -1;
     int VO = 0, VOL = 0, VOP = 0, VISO = 0, res = 0;
+    int res_main = 0;
     int i;
 
     for (i = 0; i < probe_packet->buf_size; i++) {
@@ -38,19 +44,27 @@ static int mpeg4video_probe(AVProbeData *probe_packet)
         if (temp_buffer < 2)
             continue;
 
-        if (temp_buffer == VOP_START_CODE)
+        if (temp_buffer == VOP_STARTCODE)
             VOP++;
-        else if (temp_buffer == VISUAL_OBJECT_START_CODE)
+        else if (temp_buffer == VISUAL_OBJ_STARTCODE)
             VISO++;
         else if (temp_buffer >= 0x100 && temp_buffer < 0x120)
             VO++;
         else if (temp_buffer >= 0x120 && temp_buffer < 0x130)
             VOL++;
+        else if (temp_buffer == SLICE_STARTCODE || temp_buffer == EXT_STARTCODE)
+            res_main++;
         else if (!(0x1AF < temp_buffer && temp_buffer < 0x1B7) &&
                  !(0x1B9 < temp_buffer && temp_buffer < 0x1C4))
             res++;
     }
 
+    // res_main repesents the reserved codes within the "main" profile, they are
+    // added to the reserved ones if it appears that this is a "main" profile
+    // stream
+    if (res_main && 2*res_main < VOP)
+        res += res_main;
+
     if (VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res == 0)
         return VOP+VO > 4 ? AVPROBE_SCORE_EXTENSION : AVPROBE_SCORE_EXTENSION/2;