avformat/m4vdec: Use the same constant names as libavcodec

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years ago · 0f176bb8e0
parent 34dbdcfc20
commit 0f176bb8e0
1 changed files with 7 additions and 4 deletions
--- a/libavformat/m4vdec.c
+++ b/libavformat/m4vdec.c
@ -22,8 +22,11 @@
 #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

@ -41,9 +44,9 @@ 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++;