diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-12 21:12:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-12 21:12:18 +0200 |
| commit | ddabecbbf5509325c6c695ccc60d67c0af2065f3 (patch) | |
| tree | 184a347e1232c65b83e70f508a76fe56038c511d /libavcodec | |
| parent | 2de88776892093b10522152f1f72b7dfc0320502 (diff) | |
| download | ffmpeg-ddabecbbf5509325c6c695ccc60d67c0af2065f3.tar.gz | |
vc1dec: export adv profile color format indication
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1.c | 7 | ||||
| -rw-r--r-- | libavcodec/vc1.h | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index e8dc5ed30c..d7352d3671 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -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; } } diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index b28b705fa0..6263d1dc0b 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -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 |