[FFmpeg-cvslog] avformat/m4vdec: Use the same constant names as libavcodec

[Michael Niedermayer]

ffmpeg | branch: release/4.0 | Michael Niedermayer <michael at niedermayer.cc> | Mon Apr 30 18:09:41 2018 +0200| [d976855c00298fb84869e0ba5dc2ae0d48fbcfac] | committer: Michael Niedermayer

avformat/m4vdec: Use the same constant names as libavcodec

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 0f176bb8e0896f233b35054530f76c4a778b968f)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/m4vdec.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c
index ebc7ab4f81..220daeb775 100644
--- 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++;