git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eddf952
)
vc1: initialize color properties
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Sun, 5 Oct 2014 21:58:50 +0000
(22:58 +0100)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Wed, 8 Oct 2014 17:17:50 +0000
(18:17 +0100)
libavcodec/vc1dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/vc1dec.c
b/libavcodec/vc1dec.c
index
610b13e
..
ed8253a
100644
(file)
--- 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;