diff options
| author | wm4 <wm4@nowhere> | 2016-06-03 20:35:17 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-06-03 20:35:22 +0200 |
| commit | 026b75e7f509d29d25f42cb335538f369fb6c381 (patch) | |
| tree | 23bf7c8664e97cb040fe6c90efd7156b2aa1040b /video/out/opengl/lcms.c | |
| parent | 2179879172be97541ceffdd7d29cba09c1ca9629 (diff) | |
| download | mpv-026b75e7f509d29d25f42cb335538f369fb6c381.tar.bz2 mpv-026b75e7f509d29d25f42cb335538f369fb6c381.tar.xz | |
vo_opengl: move all icc handling from vo_opengl.c to video.c
Originally, video.c did not access any CMS things (other than lut3d
being set on it), but this has changed. In practice, almost all accesses
to it have moved to video.c. vo_opengl only created it, and set the auto
icc profile path.
Complete the move.
Some things wrt. option handling are a bit fishy. (But when is this not
the case.)
icc-profile-auto was not tested, but the distributed human CI will take
care of it.
Diffstat (limited to 'video/out/opengl/lcms.c')
| -rw-r--r-- | video/out/opengl/lcms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/opengl/lcms.c b/video/out/opengl/lcms.c index 7dc1b63220..374ddb0b4c 100644 --- a/video/out/opengl/lcms.c +++ b/video/out/opengl/lcms.c @@ -145,7 +145,7 @@ void gl_lcms_set_options(struct gl_lcms *p, struct mp_icc_opts *opts) // takes over ownership. void gl_lcms_set_memory_profile(struct gl_lcms *p, bstr *profile) { - if (!p->opts.profile_auto) { + if (!p->opts.profile_auto || (p->icc_path && p->icc_path[0])) { talloc_free(profile->start); return; } |