summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.dev>2021-05-07 20:26:13 +0200
committerNiklas Haas <git@haasn.dev>2021-05-07 21:23:43 +0200
commit27f10afaa8cd44d35b37475885b3aaeb12c26aad (patch)
tree911248e52ea7b408174c3a406baaf0eceef44521
parent83c1b342506f1f6eebfb758181ae81cee09e9287 (diff)
downloadmpv-vo_placebo.tar.bz2
mpv-vo_placebo.tar.xz
(WIP) libplacebo: add support for --scale=oversamplevo_placebo
Added upstream in v4.141
-rw-r--r--video/out/vo_placebo.c3
-rw-r--r--wscript4
2 files changed, 4 insertions, 3 deletions
diff --git a/video/out/vo_placebo.c b/video/out/vo_placebo.c
index 661f730355..1391d28a3e 100644
--- a/video/out/vo_placebo.c
+++ b/video/out/vo_placebo.c
@@ -765,12 +765,13 @@ static const struct pl_filter_config *map_scaler(struct priv *p,
{ "bilinear", &pl_filter_bilinear },
{ "bicubic_fast", &pl_filter_bicubic },
{ "nearest", &pl_filter_nearest },
+ { "oversample", &pl_filter_oversample },
{0},
};
static const struct pl_filter_preset fixed_frame_mixers[] = {
{ "linear", &pl_filter_bilinear },
- { "oversample", &pl_oversample_frame_mixer },
+ { "oversample", &pl_filter_oversample },
{0},
};
diff --git a/wscript b/wscript
index 039fa0a624..82557ca9b8 100644
--- a/wscript
+++ b/wscript
@@ -733,9 +733,9 @@ video_output_features = [
'func': check_pkg_config('libplacebo >= 2.72.0'),
}, {
'name': 'vo-placebo',
- 'desc': 'libplacebo v4.137+, needed for vo_placebo',
+ 'desc': 'libplacebo v4.141+, needed for vo_placebo',
'deps': 'libplacebo',
- 'func': check_preprocessor('libplacebo/config.h', 'PL_API_VER >= 137',
+ 'func': check_preprocessor('libplacebo/config.h', 'PL_API_VER >= 141',
use='libplacebo'),
}, {
'name': '--vulkan',