aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2014-10-05 22:58:50 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-10-08 18:17:50 +0100
commit1a02e78653a5c7674e6c43b6e6f2748dbd2091d7 (patch)
tree692d078178ac6302c9ba07978f606424d1a980eb
parenteddf95283fbba1b469b76e7518bc3941f671b193 (diff)
downloadffmpeg-1a02e78653a5c7674e6c43b6e6f2748dbd2091d7.tar.gz
vc1: initialize color properties
-rw-r--r--libavcodec/vc1dec.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 610b13e0b3..ed8253a0f5 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -505,6 +505,13 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
avctx->has_b_frames = !!avctx->max_b_frames;
+ if (v->color_prim == 1 || v->color_prim == 5 || v->color_prim == 6)
+ avctx->color_primaries = v->color_prim;
+ if (v->transfer_char == 1 || v->transfer_char == 7)
+ avctx->color_trc = v->transfer_char;
+ if (v->matrix_coef == 1 || v->matrix_coef == 6 || v->matrix_coef == 7)
+ avctx->colorspace = v->matrix_coef;
+
s->mb_width = (avctx->coded_width + 15) >> 4;
s->mb_height = (avctx->coded_height + 15) >> 4;