diff options
| author | Niklas Haas <git@nand.wakku.to> | 2015-03-31 04:46:35 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-05-27 11:23:16 +0200 |
| commit | 13d4ee6d1ccbebb35639b10f8f1384ef254ccb61 (patch) | |
| tree | 9d1211060656e699140727b586af65db4c1ffcf2 /video | |
| parent | 4d6b9550fe1e0354461716f560d71d78196d5da5 (diff) | |
| download | mpv-13d4ee6d1ccbebb35639b10f8f1384ef254ccb61.tar.bz2 mpv-13d4ee6d1ccbebb35639b10f8f1384ef254ccb61.tar.xz | |
vo_opengl: icc-profile overrides icc-profile-auto
Signed-off-by: wm4 <wm4@nowhere>
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/vo_opengl.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |