summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.dev>2022-01-11 13:28:40 +0100
committerNiklas Haas <github-daiK1o@haasn.dev>2022-02-03 18:22:14 +0100
commite8e89fae3819c84068562201fe18cbe7ec180fd7 (patch)
tree73d2e85f6c3446d24cb0dbe8467e46d78c1e9858 /video/out
parent9d1f48bda28d2a611713e382e818450f4e3c92e5 (diff)
downloadmpv-e8e89fae3819c84068562201fe18cbe7ec180fd7.tar.bz2
mpv-e8e89fae3819c84068562201fe18cbe7ec180fd7.tar.xz
libplacebo: bump minimum dependency to 4.157
This has been the latest stable release for about half a year now. This version in particular lets us get rid of all the deprecation warnings in the older code. (See the following commits)
Diffstat (limited to 'video/out')
-rw-r--r--video/out/placebo/utils.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/video/out/placebo/utils.c b/video/out/placebo/utils.c
index bc4ae4a5c9..f9f90ca1a1 100644
--- a/video/out/placebo/utils.c
+++ b/video/out/placebo/utils.c
@@ -90,7 +90,10 @@ enum pl_color_transfer mp_trc_to_pl(enum mp_csp_trc trc)
case MP_CSP_TRC_SRGB: return PL_COLOR_TRC_SRGB;
case MP_CSP_TRC_LINEAR: return PL_COLOR_TRC_LINEAR;
case MP_CSP_TRC_GAMMA18: return PL_COLOR_TRC_GAMMA18;
+ case MP_CSP_TRC_GAMMA20: return PL_COLOR_TRC_GAMMA20;
case MP_CSP_TRC_GAMMA22: return PL_COLOR_TRC_GAMMA22;
+ case MP_CSP_TRC_GAMMA24: return PL_COLOR_TRC_GAMMA24;
+ case MP_CSP_TRC_GAMMA26: return PL_COLOR_TRC_GAMMA26;
case MP_CSP_TRC_GAMMA28: return PL_COLOR_TRC_GAMMA28;
case MP_CSP_TRC_PRO_PHOTO: return PL_COLOR_TRC_PRO_PHOTO;
case MP_CSP_TRC_PQ: return PL_COLOR_TRC_PQ;
@@ -99,16 +102,6 @@ enum pl_color_transfer mp_trc_to_pl(enum mp_csp_trc trc)
case MP_CSP_TRC_S_LOG1: return PL_COLOR_TRC_S_LOG1;
case MP_CSP_TRC_S_LOG2: return PL_COLOR_TRC_S_LOG2;
case MP_CSP_TRC_COUNT: return PL_COLOR_TRC_COUNT;
-
-#if PL_API_VER >= 146
- case MP_CSP_TRC_GAMMA20: return PL_COLOR_TRC_GAMMA20;
- case MP_CSP_TRC_GAMMA24: return PL_COLOR_TRC_GAMMA24;
- case MP_CSP_TRC_GAMMA26: return PL_COLOR_TRC_GAMMA26;
-#else
- case MP_CSP_TRC_GAMMA20: return PL_COLOR_TRC_UNKNOWN;
- case MP_CSP_TRC_GAMMA24: return PL_COLOR_TRC_UNKNOWN;
- case MP_CSP_TRC_GAMMA26: return PL_COLOR_TRC_UNKNOWN;
-#endif
}
MP_ASSERT_UNREACHABLE();