From 5cd7b1c8a6c1bcd6eba3f710812ca544f71fdf5d Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 27 Jun 2017 16:44:05 +0200
Subject: build: pick up new libavcodec D3D hwaccel API

This was enabled for Libav already. The patches got merged into FFmpeg
now.
---
 wscript | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'wscript')

diff --git a/wscript b/wscript
index 77c351664e..fd1f9945d2 100644
--- a/wscript
+++ b/wscript
@@ -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')),
     }
 ]
-- 
cgit v1.2.3