mirror of
https://github.com/mpv-player/mpv
synced 2024-12-23 15:22:09 +00:00
build: prefer libswresample over libavresample on FFmpeg
I hoped we could always use libavresample, but the FFmpeg project is being too dickish to enable libavresample by default - which means we need our libswresample-to-libavresample hack anyway. Give up, and use the "supported" one of the duplicated libraries when compiling against FFmpeg (relying on the fact that libswresample won't be present if compiling against Libav).
This commit is contained in:
parent
7873301be8
commit
594114e660
@ -747,14 +747,14 @@ check_pkg_config "FFmpeg/Libav" $_ffmpeg FFMPEG \
|
||||
"libavutil >= 52.48.101 libavcodec >= 55.34.1 libavformat >= 55.12.0 libswscale >= 2.1.2"
|
||||
test $(defretval) = no && die "Unable to find development files for some of the required Libav libraries above. Aborting."
|
||||
|
||||
check_pkg_config "Libavresample" $_libavresample LIBAVRESAMPLE 'libavresample >= 1.1.0'
|
||||
_libavresample=$(defretval)
|
||||
|
||||
_libswresample=auto
|
||||
test $_libavresample = yes && _libswresample=no
|
||||
check_pkg_config "Libswresample" $_libswresample LIBSWRESAMPLE 'libswresample >= 0.17.104'
|
||||
_libswresample=$(defretval)
|
||||
|
||||
_libavresample=auto
|
||||
test $_libswresample = yes && _libavresample=no
|
||||
check_pkg_config "Libavresample" $_libavresample LIBAVRESAMPLE 'libavresample >= 1.1.0'
|
||||
_libavresample=$(defretval)
|
||||
|
||||
if test "$_libswresample" = no && test "$_libavresample" = no ; then
|
||||
die "No resampler found. Install libavresample or libswresample (FFmpeg)."
|
||||
fi
|
||||
|
10
wscript
10
wscript
@ -385,15 +385,15 @@ libav_dependencies = [
|
||||
'req': True,
|
||||
'fmsg': "Unable to find development files for some of the required \
|
||||
Libav libraries ({0}). Aborting.".format(" ".join(libav_pkg_config_checks))
|
||||
}, {
|
||||
'name': '--libavresample',
|
||||
'desc': 'libavresample',
|
||||
'func': check_pkg_config('libavresample', '>= 1.1.0'),
|
||||
}, {
|
||||
'name': '--libswresample',
|
||||
'desc': 'libswresample',
|
||||
'func': check_pkg_config('libswresample', '>= 0.17.104'),
|
||||
'deps_neg': ['libavresample'],
|
||||
}, {
|
||||
'name': '--libavresample',
|
||||
'desc': 'libavresample',
|
||||
'func': check_pkg_config('libavresample', '>= 1.1.0'),
|
||||
'deps_neg': ['libswresample'],
|
||||
}, {
|
||||
'name': 'resampler',
|
||||
'desc': 'usable resampler found',
|
||||
|
Loading…
Reference in New Issue
Block a user