summaryrefslogtreecommitdiffstats
path: root/video/out/gl_video.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-06 15:04:29 +0100
committerwm4 <wm4@nowhere>2015-01-06 16:50:58 +0100
commita52ca8a2b075388dc7dd5012e4e3f4871e26b133 (patch)
tree8a29d2451c9763d425e37ba6501644a0f3d06bdb /video/out/gl_video.c
parent02362f938f0a782a39e4c069b150650fb4171dc7 (diff)
downloadmpv-a52ca8a2b075388dc7dd5012e4e3f4871e26b133.tar.bz2
mpv-a52ca8a2b075388dc7dd5012e4e3f4871e26b133.tar.xz
csputils: get rid of mp_csp_details
It used to be central, but now it's just unneeded.
Diffstat (limited to 'video/out/gl_video.c')
-rw-r--r--video/out/gl_video.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 24a7a13f1d..1ff0d9d333 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -638,19 +638,16 @@ static void update_uniforms(struct gl_video *p, GLuint program)
gl->UseProgram(program);
- struct mp_csp_details csp = MP_CSP_DETAILS_DEFAULTS;
- csp.levels_in = p->image_params.colorlevels;
- csp.levels_out = p->image_params.outputlevels;
- csp.format = p->image_params.colorspace;
-
struct mp_csp_params cparams = {
- .colorspace = csp,
+ .colorspace = p->image_params.colorspace,
+ .levels_in = p->image_params.colorlevels,
+ .levels_out = p->image_params.outputlevels,
.input_bits = p->plane_bits,
.texture_bits = (p->plane_bits + 7) & ~7,
};
mp_csp_copy_equalizer_values(&cparams, &p->video_eq);
if (p->image_desc.flags & MP_IMGFLAG_XYZ) {
- cparams.colorspace.format = MP_CSP_XYZ;
+ cparams.colorspace = MP_CSP_XYZ;
cparams.input_bits = 8;
cparams.texture_bits = 8;
}