From af9131d33867b1c8e5128d6b9e4799dedd3b1ccc Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Fri, 7 May 2021 20:26:13 +0200 Subject: [PATCH] (WIP) libplacebo: add support for --scale=oversample Added upstream in v4.141 --- video/out/vo_placebo.c | 3 ++- wscript | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/video/out/vo_placebo.c b/video/out/vo_placebo.c index 404aadf966074..fdad238d03374 100644 --- a/video/out/vo_placebo.c +++ b/video/out/vo_placebo.c @@ -774,12 +774,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 039fa0a62460a..82557ca9b8f70 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',