summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-16 20:56:00 +0100
committerwm4 <wm4@nowhere>2015-02-16 20:56:00 +0100
commit6e50e59386d3e50801051d96dfddef0ce106f8a1 (patch)
tree31ac3c904e092b2f3be67881ffe34c3a0b05823c
parentd34eabe286c46811f0fb1188c789572a57df2b5d (diff)
downloadmpv-6e50e59386d3e50801051d96dfddef0ce106f8a1.tar.bz2
mpv-6e50e59386d3e50801051d96dfddef0ce106f8a1.tar.xz
vf_vapoursynth: replace a hack with a newer VS API function
The new function does exactly what we need. Replaces the old hack, which created the vscore by running an empty script.
-rwxr-xr-xold-configure2
-rw-r--r--video/filter/vf_vapoursynth.c2
-rw-r--r--wscript2
3 files changed, 3 insertions, 3 deletions
diff --git a/old-configure b/old-configure
index dc78863007..ef0049bd99 100755
--- a/old-configure
+++ b/old-configure
@@ -860,7 +860,7 @@ test_lua "lua5.2 >= 5.2.0" # debian
test "$_lua" != yes && check_yes_no no LUA
-if ! ( $_pkg_config 'vapoursynth >= 23' ) ; then
+if ! ( $_pkg_config 'vapoursynth >= 24' ) ; then
_vapoursynth=no
_vapoursynth_lazy=no
fi
diff --git a/video/filter/vf_vapoursynth.c b/video/filter/vf_vapoursynth.c
index 8ae8add8b3..5afee78b17 100644
--- a/video/filter/vf_vapoursynth.c
+++ b/video/filter/vf_vapoursynth.c
@@ -745,7 +745,7 @@ static int drv_vss_load_core(struct vf_instance *vf)
// First load an empty script to get a VSScript, so that we get the vsapi
// and vscore.
- if (vsscript_evaluateScript(&p->se, "", NULL, 0))
+ if (vsscript_createScript(&p->se))
return -1;
p->vsapi = vsscript_getVSApi();
p->vscore = vsscript_getCore(p->se);
diff --git a/wscript b/wscript
index e7e939a629..b613d57e95 100644
--- a/wscript
+++ b/wscript
@@ -350,7 +350,7 @@ If you really mean to compile without libass support use --disable-libass."
}, {
'name': 'vapoursynth-core',
'desc': 'VapourSynth filter bridge (core)',
- 'func': check_pkg_config('vapoursynth >= 23'),
+ 'func': check_pkg_config('vapoursynth >= 24'),
}, {
'name': '--vapoursynth',
'desc': 'VapourSynth filter bridge (Python)',