summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-11 10:48:54 +0100
committerwm4 <wm4@nowhere>2014-11-11 10:48:54 +0100
commitd8cd768ed078e875a05b08251ec94fdb7ee03d08 (patch)
tree23bfaea2ca7f01dc04afa8c2a690ebcc4969cd7a
parent5fd8a1e04c725329435e3bead5f11ee3ffb9f1c1 (diff)
downloadmpv-d8cd768ed078e875a05b08251ec94fdb7ee03d08.tar.bz2
mpv-d8cd768ed078e875a05b08251ec94fdb7ee03d08.tar.xz
vo_opengl: don't reset user-set gamma when using vo_cmdline
-rw-r--r--video/out/gl_video.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index a0f23e9157..27b4fe366d 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -2390,6 +2390,9 @@ void gl_video_set_options(struct gl_video *p, struct gl_video_opts *opts)
p->scalers[n].name = p->opts.scalers[n];
}
+ if (!p->opts.gamma && p->video_eq.values[MP_CSP_EQ_GAMMA] != 0)
+ p->opts.gamma = 1.0f;
+
check_gl_features(p);
reinit_rendering(p);
}