diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-09 02:54:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-09 03:06:20 +0200 |
| commit | f6777ce6fe7cefb027789c069ec14b394a874073 (patch) | |
| tree | 369b6378cc2ecd2c30644082205e5e8be0862bca /libavcodec/vc1.c | |
| parent | 5b134a0544ebfd129b087c3a2bb68a8847232322 (diff) | |
| parent | 1a02e78653a5c7674e6c43b6e6f2748dbd2091d7 (diff) | |
| download | ffmpeg-f6777ce6fe7cefb027789c069ec14b394a874073.tar.gz | |
Merge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7'
* commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7':
vc1: initialize color properties
See: ddabecbbf5509325c6c695ccc60d67c0af2065f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
| -rw-r--r-- | libavcodec/vc1.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index d23efecc16..77c4b57d3e 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -496,10 +496,9 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) } if (get_bits1(gb)) { - 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; + v->color_prim = get_bits(gb, 8); + v->transfer_char = get_bits(gb, 8); + v->matrix_coef = get_bits(gb, 8); } } |