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

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:
wm4 2015-01-02 01:43:59 +01:00
parent 7873301be8
commit 594114e660
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
old-configure
View File

@ -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" "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." 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' check_pkg_config "Libswresample" $_libswresample LIBSWRESAMPLE 'libswresample >= 0.17.104'
_libswresample=$(defretval) _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 if test "$_libswresample" = no && test "$_libavresample" = no ; then
die "No resampler found. Install libavresample or libswresample (FFmpeg)." die "No resampler found. Install libavresample or libswresample (FFmpeg)."
fi fi

10
wscript
View File

@ -385,15 +385,15 @@ 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 \
Libav libraries ({0}). Aborting.".format(" ".join(libav_pkg_config_checks)) Libav libraries ({0}). Aborting.".format(" ".join(libav_pkg_config_checks))
}, {
'name': '--libavresample',
'desc': 'libavresample',
'func': check_pkg_config('libavresample', '>= 1.1.0'),
}, { }, {
'name': '--libswresample', 'name': '--libswresample',
'desc': 'libswresample', 'desc': 'libswresample',
'func': check_pkg_config('libswresample', '>= 0.17.104'), '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', 'name': 'resampler',
'desc': 'usable resampler found', 'desc': 'usable resampler found',