From 13d4ee6d1ccbebb35639b10f8f1384ef254ccb61 Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Tue, 31 Mar 2015 04:46:35 +0200 Subject: vo_opengl: icc-profile overrides icc-profile-auto Signed-off-by: wm4 --- video/out/vo_opengl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'video') diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index bb7470eaf4..5b08c21768 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -238,7 +238,8 @@ static void call_request_hwdec_api(struct mp_hwdec_info *info, static bool get_and_update_icc_profile(struct gl_priv *p, int *events) { - if (p->icc_opts->profile_auto) { + bool has_profile = p->icc_opts->profile && p->icc_opts->profile[0]; + if (p->icc_opts->profile_auto && !has_profile) { MP_VERBOSE(p, "Querying ICC profile...\n"); bstr icc = bstr0(NULL); int r = mpgl_control(p->glctx, events, VOCTRL_GET_ICC_PROFILE, &icc); -- cgit v1.2.3