From fcb970492ccb5f351f4dce7ba52aefd38f544fe9 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 12 Jan 2017 09:19:02 +0100
Subject: wscript: slightly simplify configure check for new vaapi decode API

We can drop the weird acrobatics with the is_ffmpeg. We can distinguish
them directly within the vaapi check, duh.
---
 wscript | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'wscript')

diff --git a/wscript b/wscript
index 891f975027..193cf70bc4 100644
--- a/wscript
+++ b/wscript
@@ -419,13 +419,6 @@ libav_dependencies = [
         'req': True,
         'fmsg': "Unable to find development files for some of the required \
 FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_string)
-    }, {
-        'name': 'is_ffmpeg',
-        'desc': 'libav* is FFmpeg',
-        # FFmpeg <=> LIBAVUTIL_VERSION_MICRO>=100
-        'func': check_statement('libavutil/version.h',
-                                'int x[LIBAVUTIL_VERSION_MICRO >= 100 ? 1 : -1]',
-                                use='libav')
     }, {
         'name': '--libswresample',
         'desc': 'libswresample',
@@ -844,10 +837,10 @@ hwaccel_features = [
         'name': '--vaapi-hwaccel-new',
         'desc': 'libavcodec VAAPI hwaccel (new)',
         'deps': [ 'vaapi-hwaccel' ],
-        'deps_neg': [ 'is_ffmpeg' ],
         'func': check_statement('libavcodec/version.h',
-                                'int x[LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 26, 0) ? 1 : -1]',
-                                use='libav'),
+            'int x[(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 26, 0) && '
+            '       LIBAVCODEC_VERSION_MICRO < 100) ? 1 : -1]',
+            use='libav'),
     }, {
         'name': '--vaapi-hwaccel-old',
         'desc': 'libavcodec VAAPI hwaccel (old)',
-- 
cgit v1.2.3