vc1dec: export adv profile color format indication
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Sep 2012 19:12:18 +0000 (21:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Sep 2012 19:12:18 +0000 (21:12 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vc1.c
libavcodec/vc1.h

index e8dc5ed..d7352d3 100644 (file)
@@ -503,9 +503,10 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
         }
 
         if (get_bits1(gb)) {
-            v->color_prim    = get_bits(gb, 8);
-            v->transfer_char = get_bits(gb, 8);
-            v->matrix_coef   = get_bits(gb, 8);
+            v->s.avctx->color_primaries = get_bits(gb, 8);
+            v->s.avctx->color_trc       = get_bits(gb, 8);
+            v->s.avctx->colorspace      = get_bits(gb, 8);
+            v->s.avctx->color_range     = AVCOL_RANGE_MPEG;
         }
     }
 
index b28b705..6263d1d 100644 (file)
@@ -210,9 +210,6 @@ typedef struct VC1Context{
     int panscanflag;      ///< NUMPANSCANWIN, TOPLEFT{X,Y}, BOTRIGHT{X,Y} present
     int refdist_flag;     ///< REFDIST syntax element present in II, IP, PI or PP field picture headers
     int extended_dmv;     ///< Additional extended dmv range at P/B frame-level
-    int color_prim;       ///< 8bits, chroma coordinates of the color primaries
-    int transfer_char;    ///< 8bits, Opto-electronic transfer characteristics
-    int matrix_coef;      ///< 8bits, Color primaries->YCbCr transform matrix
     int hrd_param_flag;   ///< Presence of Hypothetical Reference
                           ///< Decoder parameters
     int psf;              ///< Progressive Segmented Frame