From 20c11e4cee9934069d3e85071f5ba70b1a0830f1 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sat, 5 May 2007 18:31:34 +0000 Subject: [PATCH] avoid a clash between two definitions of SEQ_START_CODE Originally committed as revision 8903 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/cavs.c | 2 +- libavcodec/cavsdata.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 4672635..f4f310a 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -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; diff --git a/libavcodec/cavsdata.h b/libavcodec/cavsdata.h index d769851..6d61495 100644 --- a/libavcodec/cavsdata.h +++ b/libavcodec/cavsdata.h @@ -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 -- 2.7.4