[FFmpeg-cvslog] r8903 - in trunk/libavcodec: cavs.c cavsdata.h

[aurel]

Author: aurel
Date: Sat May  5 20:31:34 2007
New Revision: 8903

Log:
avoid a clash between two definitions of SEQ_START_CODE

Modified:
   trunk/libavcodec/cavs.c
   trunk/libavcodec/cavsdata.h

Modified: trunk/libavcodec/cavs.c
==============================================================================
--- trunk/libavcodec/cavs.c	(original)
+++ trunk/libavcodec/cavs.c	Sat May  5 20:31:34 2007
@@ -1352,7 +1352,7 @@ static int cavs_decode_frame(AVCodecCont
             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;

Modified: trunk/libavcodec/cavsdata.h
==============================================================================
--- trunk/libavcodec/cavsdata.h	(original)
+++ trunk/libavcodec/cavsdata.h	Sat May  5 20:31:34 2007
@@ -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