virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avoid a clash between two definitions of SEQ_START_CODE

Browse Source 
Originally committed as revision 8903 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2007-05-05 18:31:34 +00:00
parent 95dca03f77
commit 20c11e4cee
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/cavs.c
View File

@ -1352,7 +1352,7 @@ static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size,
return FFMAX(0, buf_ptr - buf - s->parse_context.last_index);
input_size = (buf_end - buf_ptr)*8;
switch(stc) {
case SEQ_START_CODE:
case CAVS_START_CODE:
init_get_bits(&s->gb, buf_ptr, input_size);
decode_seq_header(h);
break;

2
libavcodec/cavsdata.h
View File

@ -23,7 +23,7 @@
#define SLICE_MAX_START_CODE 0x000001af
#define EXT_START_CODE 0x000001b5
#define USER_START_CODE 0x000001b2
#define SEQ_START_CODE 0x000001b0
#define CAVS_START_CODE 0x000001b0
#define PIC_I_START_CODE 0x000001b3
#define PIC_PB_START_CODE 0x000001b6