summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-05 23:27:14 +0100
committerwm4 <wm4@nowhere>2014-01-06 20:23:10 +0100
commite6c184e2b178d77b77acd02acd818bb5a3b1565c (patch)
treeea9371964ecfdaba49d0ee12b2c43aae22e4f529
parent33c49209671dce8bfa6c1ada468b225f2f353a6e (diff)
downloadmpv-e6c184e2b178d77b77acd02acd818bb5a3b1565c.tar.bz2
mpv-e6c184e2b178d77b77acd02acd818bb5a3b1565c.tar.xz
build: don't depend on both libavresample and libswresample
When both libavresample and libswresample were detected, the script enabled both at the same time. This is not supported; although nothing bad happened apparently. Make the dependencies both mutually exclusive.
-rw-r--r--wscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/wscript b/wscript
index eda8d4f7c1..143a88a94e 100644
--- a/wscript
+++ b/wscript
@@ -335,6 +335,7 @@ Libav libraries ({0}). Aborting.".format(" ".join(libav_pkg_config_checks))
'name': '--libswresample',
'desc': 'libswresample',
'func': check_pkg_config('libswresample', '>= 0.17.102'),
+ 'deps_neg': ['libavresample'],
}, {
'name': 'resampler',
'desc': 'usable resampler found',