Mercurial > libavcodec.hg

changeset 4917:6c457e692336 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid a clash between two definitions of SEQ_START_CODE
author aurel
date Sat, 05 May 2007 18:31:34 +0000
parents 13ef168891b0
children f77445d40161
files cavs.c cavsdata.h
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/cavs.c	Sat May 05 18:25:02 2007 +0000
+++ b/cavs.c	Sat May 05 18:31:34 2007 +0000
@@ -1352,7 +1352,7 @@
             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;
--- a/cavsdata.h	Sat May 05 18:25:02 2007 +0000
+++ b/cavsdata.h	Sat May 05 18:31:34 2007 +0000
@@ -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