build: remove explicit checks for VPP

This was once done when old versions of libva without VPP had to be
supported. Some parts of it were removed earlier already.
This commit is contained in:
wm4 2015-10-17 14:25:09 +02:00
parent 0eb45343ca
commit d27d91715f
4 changed files with 3 additions and 13 deletions

View File

@ -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'

View File

@ -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

View File

@ -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',

View File

@ -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"),