Commit d55790f3 authored by aurel's avatar aurel

avoid a clash between two definitions of SEQ_START_CODE

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@8903 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 58b0e4cd
......@@ -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;
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment