[FFmpeg-soc] [soc]: r3769 - in dirac/libavcodec: dirac.h diracdec.c diracenc.c

[conrad]

Author: conrad
Date: Mon Nov 10 04:11:02 2008
New Revision: 3769

Log:
Rename access_unit_header to sequence_header to match the updated spec


Modified:
   dirac/libavcodec/dirac.h
   dirac/libavcodec/diracdec.c
   dirac/libavcodec/diracenc.c

Modified: dirac/libavcodec/dirac.h
==============================================================================
--- dirac/libavcodec/dirac.h	(original)
+++ dirac/libavcodec/dirac.h	Mon Nov 10 04:11:02 2008
@@ -258,7 +258,7 @@ typedef struct DiracContext {
 } DiracContext;
 
 typedef enum {
-    pc_access_unit_header = 0x00,
+    pc_seq_header         = 0x00,
     pc_eos                = 0x10,
     pc_aux_data           = 0x20,
     pc_padding            = 0x60,

Modified: dirac/libavcodec/diracdec.c
==============================================================================
--- dirac/libavcodec/diracdec.c	(original)
+++ dirac/libavcodec/diracdec.c	Mon Nov 10 04:11:02 2008
@@ -207,9 +207,9 @@ static int parse_source_parameters(Dirac
 }
 
 /**
- * Parse the access unit header
+ * Parse the sequence header
  */
-static int parse_access_unit_header(DiracContext *s) {
+static int parse_sequence_header(DiracContext *s) {
     GetBitContext *gb = &s->gb;
     unsigned int version_major;
     unsigned int version_minor;
@@ -1077,8 +1077,8 @@ int dirac_decode_frame(AVCodecContext *a
     init_get_bits(&s->gb, &buf[13], (buf_size - 13) * 8);
     s->avctx = avctx;
 
-    if (parse_code ==  pc_access_unit_header) {
-        if (parse_access_unit_header(s))
+    if (parse_code ==  pc_seq_header) {
+        if (parse_sequence_header(s))
             return -1;
 
         /* Dump the header.  */

Modified: dirac/libavcodec/diracenc.c
==============================================================================
--- dirac/libavcodec/diracenc.c	(original)
+++ dirac/libavcodec/diracenc.c	Mon Nov 10 04:11:02 2008
@@ -905,7 +905,7 @@ static int encode_frame(AVCodecContext *
     s->picture = *picture;
 
     if (s->next_parse_code == 0) {
-        dirac_encode_parse_info(s, pc_access_unit_header);
+        dirac_encode_parse_info(s, pc_seq_header);
         dirac_encode_access_unit_header(s);
         s->next_parse_code = 0x0C;
     } else if (s->next_parse_code == 0x0C) {