From eddf95283fbba1b469b76e7518bc3941f671b193 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Sun, 5 Oct 2014 22:58:50 +0100 Subject: [PATCH] vp9: initialize color space and range properties --- libavcodec/vp9.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 2a6a138aa1..50b84ae97e 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1040,6 +1040,18 @@ static int vp9_decode_frame(AVCodecContext *avctx, AVFrame *frame, s->cur_frame->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; + if (s->fullrange) + avctx->color_range = AVCOL_RANGE_JPEG; + else + avctx->color_range = AVCOL_RANGE_MPEG; + + switch (s->colorspace) { + case 1: avctx->colorspace = AVCOL_SPC_BT470BG; break; + case 2: avctx->colorspace = AVCOL_SPC_BT709; break; + case 3: avctx->colorspace = AVCOL_SPC_SMPTE170M; break; + case 4: avctx->colorspace = AVCOL_SPC_SMPTE240M; break; + } + // main tile decode loop memset(s->above_partition_ctx, 0, s->cols); memset(s->above_skip_ctx, 0, s->cols);