summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Haas <git@nand.wakku.to>2015-04-12 03:34:38 +0200
committerwm4 <wm4@nowhere>2015-05-27 11:32:42 +0200
commitb65c548b7d65d84e4d025c9f4ab771ad1c588bc1 (patch)
treef6f2d4d6f8ac0573541a8e73d48de494366c6db6
parentae1ac475ac636199759d8e5229532e82823a32da (diff)
downloadmpv-b65c548b7d65d84e4d025c9f4ab771ad1c588bc1.tar.bz2
mpv-b65c548b7d65d84e4d025c9f4ab771ad1c588bc1.tar.xz
vo_opengl: fix source-shader + XYZ input
-rw-r--r--video/out/gl_video.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index b007b25bf2..add26caefa 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -1429,6 +1429,11 @@ static void pass_read_video(struct gl_video *p)
// Custom source shaders are required to output at the full range
p->use_full_range = shader != NULL;
+ if (p->image_desc.flags & MP_IMGFLAG_XYZ) {
+ cmul = 1.0;
+ p->use_full_range = true;
+ }
+
// Special case for non-planar content
if (p->plane_count == 1) {
if (shader) {
@@ -1546,8 +1551,6 @@ static void pass_convert_yuv(struct gl_video *p)
// Pre-colormatrix input gamma correction
if (p->image_desc.flags & MP_IMGFLAG_XYZ) {
cparams.colorspace = MP_CSP_XYZ;
- cparams.input_bits = 8;
- cparams.texture_bits = 8;
// Pre-colormatrix input gamma correction. Note that this results in
// linear light