summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-16 10:22:28 +0100
committerwm4 <wm4@nowhere>2015-03-16 10:22:28 +0100
commite744eef322a03a73f435cde4f4378dd0bb0f8a3c (patch)
treeee75745e792e20e8453d595950166c24ddc8916f
parentaa728d5d6fa2eada9138d195f19e2b67df37507e (diff)
downloadmpv-e744eef322a03a73f435cde4f4378dd0bb0f8a3c.tar.bz2
mpv-e744eef322a03a73f435cde4f4378dd0bb0f8a3c.tar.xz
vo_opengl: fix incorrectly drawn OSD in idle mode
Trade one bug for another, I don't even care anymore. Fixes #1691.
-rw-r--r--video/out/gl_video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index c100daafbb..104f494c66 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -1334,8 +1334,6 @@ static void pass_convert_yuv(struct gl_video *p)
mp_csp_set_image_params(&cparams, &p->image_params);
mp_csp_copy_equalizer_values(&cparams, &p->video_eq);
- p->user_gamma = 1.0 / (cparams.gamma * p->opts.gamma);
-
GLSLF("// color conversion\n");
if (p->color_swizzle[0])
@@ -1848,6 +1846,8 @@ void gl_video_render_frame(struct gl_video *p, int fbo, struct frame_timing *t)
GL *gl = p->gl;
struct video_image *vimg = &p->image;
+ p->user_gamma = 1.0 / p->opts.gamma;
+
gl->BindFramebuffer(GL_FRAMEBUFFER, fbo);
if (p->dst_rect.x0 > 0 || p->dst_rect.y0 > 0