diff options
| author | wm4 <wm4@nowhere> | 2017-06-27 16:44:05 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-06-27 18:08:34 +0200 |
| commit | 5cd7b1c8a6c1bcd6eba3f710812ca544f71fdf5d (patch) | |
| tree | 9f3702fe0ec377290c5ce6237ee08bed3b0fd2ff /wscript | |
| parent | e7990944def9e1f89e803504a3e92dd044d23b6e (diff) | |
| download | mpv-5cd7b1c8a6c1bcd6eba3f710812ca544f71fdf5d.tar.bz2 mpv-5cd7b1c8a6c1bcd6eba3f710812ca544f71fdf5d.tar.xz | |
build: pick up new libavcodec D3D hwaccel API
This was enabled for Libav already. The patches got merged into FFmpeg
now.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -789,10 +789,13 @@ hwaccel_features = [ 'name': '--d3d-hwaccel-new', 'desc': 'DXVA2 and 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)' - ' ? 1 : -1]', - use='libav'), + 'int x[(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 4, 0) && ' + ' LIBAVCODEC_VERSION_MICRO < 100) ||' + ' (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 100, 100) && ' + ' LIBAVCODEC_VERSION_MICRO >= 100)' + ' ? 1 : -1]', + use='libav'), + 'deps': [ 'd3d-hwaccel' ], }, { 'name': '--cuda-hwaccel', 'desc': 'CUDA hwaccel', @@ -803,6 +806,7 @@ hwaccel_features = [ 'name': 'sse4-intrinsics', 'desc': 'GCC SSE4 intrinsics for GPU memcpy', 'deps_any': [ 'd3d-hwaccel' ], + 'deps_neg': [ 'd3d-hwaccel-new' ], 'func': check_cc(fragment=load_fragment('sse.c')), } ] |