RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-01 03:40:43 +00:00
Code Issues Releases Wiki Activity

vo_opengl: icc-profile overrides icc-profile-auto

Browse Source 
Signed-off-by: wm4 <wm4@nowhere>
This commit is contained in:
Niklas Haas 2015-03-31 04:46:35 +02:00 committed by wm4
parent 4d6b9550fe
commit 13d4ee6d1c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOCS/man/vo.rst
View File

@ -732,8 +732,8 @@ Available video output drivers are:
``icc-profile=<file>``
Load an ICC profile and use it to transform linear RGB to screen output.
Needs LittleCMS 2 support compiled in. This option overrides the
``target-prim`` and ``target-trc`` options. It also enables
``linear-scaling``.
``target-prim``, ``target-trc`` and ``icc-profile-auto`` options. It
also enables ``linear-scaling``.
``icc-profile-auto``
Automatically select the ICC display profile currently specified by

3
video/out/vo_opengl.c
View File

@ -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);