[FFmpeg-soc] [soc]: r3811 - in dirac/libavcodec: dirac.c dirac.h

[conrad]

Author: conrad
Date: Tue Nov 11 09:38:07 2008
New Revision: 3811

Log:
Use level/profile in AVCodecContext rather than duplicating them


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

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Tue Nov 11 09:38:07 2008
@@ -332,10 +332,8 @@ int ff_dirac_parse_sequence_header(AVCod
     /* XXX: Don't check the version yet, existing encoders do not yet
        set this to a sane value (0.6 at the moment). */
 
-    /* XXX: Not yet documented in the spec.  This is actually the main
-       thing that is missing. */
-    s->profile = svq3_get_ue_golomb(gb);
-    s->level = svq3_get_ue_golomb(gb);
+    avctx->profile = svq3_get_ue_golomb(gb);
+    avctx->level   = svq3_get_ue_golomb(gb);
     dprintf(s->avctx, "Access unit header: Version %d.%d\n",
             version_major, version_minor);
     dprintf(s->avctx, "Profile: %d, Level: %d\n", s->profile, s->level);

Modified: dirac/libavcodec/dirac.h
==============================================================================
--- dirac/libavcodec/dirac.h	(original)
+++ dirac/libavcodec/dirac.h	Tue Nov 11 09:38:07 2008
@@ -158,9 +158,6 @@ struct reference_frame {
 };
 
 typedef struct DiracContext {
-    unsigned int profile;
-    unsigned int level;
-
     AVCodecContext *avctx;
     GetBitContext gb;