From 917374a7bfaa90233c239aca18968e6454fc8bc2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 5 Jan 2014 23:27:14 +0100 Subject: 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. --- wscript | 1 + 1 file changed, 1 insertion(+) (limited to 'wscript') 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', -- cgit v1.2.3