diff options
author | wm4 <wm4@nowhere> | 2017-01-12 09:19:02 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-01-12 13:57:52 +0100 |
commit | fcb970492ccb5f351f4dce7ba52aefd38f544fe9 (patch) | |
tree | 52640b761bd70981b6ceeef319f8df3de3f81f0e | |
parent | 32186de3678cab5a63fd947e256c3b0f5ad0a72f (diff) | |
download | mpv-fcb970492ccb5f351f4dce7ba52aefd38f544fe9.tar.bz2 mpv-fcb970492ccb5f351f4dce7ba52aefd38f544fe9.tar.xz |
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.
-rw-r--r-- | wscript | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -420,13 +420,6 @@ libav_dependencies = [ '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', 'func': check_pkg_config('libswresample', '>= 2.3.100'), @@ -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)', |