summaryrefslogtreecommitdiffstats
path: root/video/decode
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2016-11-08 17:53:55 +0100
committerwm4 <wm4@nowhere>2016-11-08 19:16:26 +0100
commitc676c31815b5c8bd9ba6eab968bbc0862eaa4bba (patch)
tree1ab96beb3363ce97a588f5e52dab60afcd3161e5 /video/decode
parent81ceb7b6a57422e5d05593d49b14d99479f266a0 (diff)
downloadmpv-c676c31815b5c8bd9ba6eab968bbc0862eaa4bba.tar.bz2
mpv-c676c31815b5c8bd9ba6eab968bbc0862eaa4bba.tar.xz
demux: expose demuxer colorimetry metadata to player
Implementation-wise, the values from the demuxer/codec header are merged with the values from the decoder such that the former are used only where the latter are unknown (0/auto).
Diffstat (limited to 'video/decode')
-rw-r--r--video/decode/dec_video.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index 7e144a72bc..0dc51943bc 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -245,6 +245,7 @@ static void fix_image_params(struct dec_video *d_video,
p.stereo_out = opts->video_stereo_mode;
// Detect colorspace from resolution.
+ mp_colorspace_merge(&p.color, &c->color);
mp_image_params_guess_csp(&p);
d_video->last_format = *params;