summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-02 01:43:59 +0100
committerwm4 <wm4@nowhere>2015-01-02 01:43:59 +0100
commit594114e660a1b7626d8358a2b24fe000166e0ad8 (patch)
treef2b09436d15b5dfbf659e055c89759de8b718e0f /wscript
parent7873301be8a0ed3b6a70c5a32a36e4fa52284ffb (diff)
downloadmpv-594114e660a1b7626d8358a2b24fe000166e0ad8.tar.bz2
mpv-594114e660a1b7626d8358a2b24fe000166e0ad8.tar.xz
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).
Diffstat (limited to 'wscript')
-rw-r--r--wscript10
1 files changed, 5 insertions, 5 deletions
diff --git a/wscript b/wscript
index 98b8eab1ea..d754199f82 100644
--- a/wscript
+++ b/wscript
@@ -386,14 +386,14 @@ libav_dependencies = [
'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',