RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2017-01-12 09:19:02 +01:00
parent 32186de367
commit fcb970492c
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wscript
View File

@ -419,13 +419,6 @@ libav_dependencies = [
'req': True, 'req': True,
'fmsg': "Unable to find development files for some of the required \ 'fmsg': "Unable to find development files for some of the required \
FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_string) 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', 'name': '--libswresample',
'desc': 'libswresample', 'desc': 'libswresample',
@ -844,9 +837,9 @@ hwaccel_features = [
'name': '--vaapi-hwaccel-new', 'name': '--vaapi-hwaccel-new',
'desc': 'libavcodec VAAPI hwaccel (new)', 'desc': 'libavcodec VAAPI hwaccel (new)',
'deps': [ 'vaapi-hwaccel' ], 'deps': [ 'vaapi-hwaccel' ],
'deps_neg': [ 'is_ffmpeg' ],
'func': check_statement('libavcodec/version.h', 'func': check_statement('libavcodec/version.h',
'int x[LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 26, 0) ? 1 : -1]', 'int x[(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 26, 0) && '
' LIBAVCODEC_VERSION_MICRO < 100) ? 1 : -1]',
use='libav'), use='libav'),
}, { }, {
'name': '--vaapi-hwaccel-old', 'name': '--vaapi-hwaccel-old',