diff --git a/TOOLS/old-configure b/TOOLS/old-configure
index 9d8bd2f8f9..4ae6c72f26 100755
--- a/TOOLS/old-configure
+++ b/TOOLS/old-configure
@@ -618,12 +618,6 @@ _vaapi_wayland=auto
 fi
 check_pkg_config "VAAPI Wayland" $_vaapi_wayland VAAPI_WAYLAND 'libva-wayland >= 0.34.0'
 
-if test "$_vaapi" = yes ; then
-    check_pkg_config "VAAPI VPP" auto VAAPI_VPP 'libva >= 0.34.0'
-else
-    check_yes_no no VAAPI_VPP
-fi
-
 check_pkg_config "Xinerama" $_xinerama XINERAMA 'xinerama'
 
 check_pkg_config "Xrandr" $_xrandr XRANDR 'xrandr >= 1.2.0'
diff --git a/TOOLS/old-makefile b/TOOLS/old-makefile
index 3c90a4060d..7961464dd3 100644
--- a/TOOLS/old-makefile
+++ b/TOOLS/old-makefile
@@ -88,8 +88,8 @@ SOURCES-$(VDPAU)                += video/vdpau.c video/vdpau_mixer.c \
 SOURCES-$(VDPAU_GL_X11)         += video/out/opengl/hwdec_vdpau.c
 SOURCES-$(VAAPI)                += video/out/vo_vaapi.c \
                                    video/decode/vaapi.c \
+                                   video/filter/vf_vavpp.c \
                                    video/vaapi.c
-SOURCES-$(VAAPI_VPP)            += video/filter/vf_vavpp.c
 SOURCES-$(VAAPI_GLX)            += video/out/opengl/hwdec_vaglx.c
 SOURCES-$(VAAPI_X_EGL)          += video/out/opengl/hwdec_vaegl.c
 
diff --git a/wscript b/wscript
index d9dd156968..2aac0f552d 100644
--- a/wscript
+++ b/wscript
@@ -658,11 +658,7 @@ video_output_features = [
         'desc': 'VAAPI (Wayland support)',
         'deps': [ 'vaapi', 'wayland' ],
         'func': check_pkg_config('libva-wayland', '>= 0.36.0'),
-    }, {
-        'name': '--vaapi-vpp',
-        'desc': 'VAAPI VPP',
-        'deps': [ 'vaapi' ],
-        'func': check_pkg_config('libva', '>= 0.36.0'),
+
     }, {
         'name': '--vaapi-glx',
         'desc': 'VAAPI GLX',
diff --git a/wscript_build.py b/wscript_build.py
index a9f9714c75..c410c3724d 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -302,7 +302,7 @@ def build(ctx):
         ( "video/filter/vf_stereo3d.c",          "libavfilter"),
         ( "video/filter/vf_sub.c" ),
         ( "video/filter/vf_vapoursynth.c",       "vapoursynth-core" ),
-        ( "video/filter/vf_vavpp.c",             "vaapi-vpp"),
+        ( "video/filter/vf_vavpp.c",             "vaapi"),
         ( "video/filter/vf_vdpaupp.c",           "vdpau" ),
         ( "video/filter/vf_vdpaurb.c",           "vdpau" ),
         ( "video/filter/vf_yadif.c",             "libavfilter"),