mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/m4vdec: Use the same constant names as libavcodec
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 0f176bb8e0
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
7bc5d49c60
commit
d976855c00
|
@ -22,8 +22,11 @@
|
||||||
#include "avformat.h"
|
#include "avformat.h"
|
||||||
#include "rawdec.h"
|
#include "rawdec.h"
|
||||||
|
|
||||||
#define VISUAL_OBJECT_START_CODE 0x000001b5
|
#define VOS_STARTCODE 0x1B0
|
||||||
#define VOP_START_CODE 0x000001b6
|
#define USER_DATA_STARTCODE 0x1B2
|
||||||
|
#define GOP_STARTCODE 0x1B3
|
||||||
|
#define VISUAL_OBJ_STARTCODE 0x1B5
|
||||||
|
#define VOP_STARTCODE 0x1B6
|
||||||
#define SLICE_STARTCODE 0x1B7
|
#define SLICE_STARTCODE 0x1B7
|
||||||
#define EXT_STARTCODE 0x1B8
|
#define EXT_STARTCODE 0x1B8
|
||||||
|
|
||||||
|
@ -41,9 +44,9 @@ static int mpeg4video_probe(AVProbeData *probe_packet)
|
||||||
if (temp_buffer < 2)
|
if (temp_buffer < 2)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (temp_buffer == VOP_START_CODE)
|
if (temp_buffer == VOP_STARTCODE)
|
||||||
VOP++;
|
VOP++;
|
||||||
else if (temp_buffer == VISUAL_OBJECT_START_CODE)
|
else if (temp_buffer == VISUAL_OBJ_STARTCODE)
|
||||||
VISO++;
|
VISO++;
|
||||||
else if (temp_buffer >= 0x100 && temp_buffer < 0x120)
|
else if (temp_buffer >= 0x100 && temp_buffer < 0x120)
|
||||||
VO++;
|
VO++;
|
||||||
|
|
Loading…
Reference in New Issue