From ae7db6503b6fc6fce78d20e8afc77a5a7a0f0b29 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 26 Sep 2017 18:12:19 +0200 Subject: video: drop old D3D11/DXVA2 support Now you need FFmpeg git, or something. This also gets rid of the last real use of gpu_memcpy(). libavutil does that itself. (vaapi.c still used it, but it was essentially unused, because the code path isn't really in use anymore. It wasn't even included due to the d3d-hwaccel dependency in wscript.) --- wscript | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 694ead0736..a496fd3702 100644 --- a/wscript +++ b/wscript @@ -873,12 +873,8 @@ hwaccel_features = [ }, { # (conflated with ANGLE for easier deps) 'name': '--d3d-hwaccel', - 'desc': 'D3D11VA hwaccel (plus ANGLE)', + 'desc': 'D3D11VA hwaccel (new API, plus ANGLE)', 'deps': 'os-win32 && egl-angle', - 'func': check_true, - }, { - 'name': '--d3d-hwaccel-new', - 'desc': 'D3D11VA hwaccel (new API)', 'func': check_statement('libavcodec/version.h', 'int x[(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 4, 0) && ' ' LIBAVCODEC_VERSION_MICRO < 100) ||' @@ -886,7 +882,6 @@ hwaccel_features = [ ' LIBAVCODEC_VERSION_MICRO >= 100)' ' ? 1 : -1]', use='libav'), - 'deps': 'd3d-hwaccel', }, { 'name': '--d3d9-hwaccel', 'desc': 'DXVA2 hwaccel (plus ANGLE)', @@ -904,11 +899,6 @@ hwaccel_features = [ 'deps': 'gl', 'func': check_cc(fragment=load_fragment('cuda.c'), use='libav'), - }, { - 'name': 'sse4-intrinsics', - 'desc': 'GCC SSE4 intrinsics for GPU memcpy', - 'deps': 'd3d-hwaccel && !d3d-hwaccel-new && gpl', - 'func': check_cc(fragment=load_fragment('sse.c')), } ] -- cgit v1.2.3