summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-11-01 01:58:16 +0100
committerwm4 <wm4@nowhere>2017-11-01 01:58:16 +0100
commit501230f2a014887ce38e0d3a73bb432166f611f1 (patch)
tree6ddae2449f93b885af9f2045d5ed11c92de522ff /video/out
parent95c6a482eb9d97f180b54e45d2c5aa360b218cba (diff)
downloadmpv-501230f2a014887ce38e0d3a73bb432166f611f1.tar.bz2
mpv-501230f2a014887ce38e0d3a73bb432166f611f1.tar.xz
vo_gpu: potentially fix icc-profile-auto updating
vo_gpu.c will call gl_video_icc_auto_enabled() to check whether it should retrieve the ICC profile. But the value returned by this function will be outdated, because gl_video_update_options() is not called yet. Change the order of function calls so that this is done after updating the options. (This is fairly chaotic, but I guess this code will be refactored a dozen of times anyway in the future.)
Diffstat (limited to 'video/out')
-rw-r--r--video/out/vo_gpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/vo_gpu.c b/video/out/vo_gpu.c
index 98a21bf755..d739cf6bfa 100644
--- a/video/out/vo_gpu.c
+++ b/video/out/vo_gpu.c
@@ -198,8 +198,8 @@ static int control(struct vo *vo, uint32_t request, void *data)
request_hwdec_api(vo, data);
return true;
case VOCTRL_UPDATE_RENDER_OPTS: {
- get_and_update_icc_profile(p);
gl_video_configure_queue(p->renderer, vo);
+ get_and_update_icc_profile(p);
vo->want_redraw = true;
return true;
}