From c2b02962527d17e8d271b72f2aeb6c8a3b593865 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Fri, 19 Feb 2016 17:08:06 +0100 Subject: [PATCH] prepare.py: if enabling tunnel, turn off ffmpeg as well --- prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index b3bdcba84..1ae3c4f42 100755 --- a/prepare.py +++ b/prepare.py @@ -500,7 +500,7 @@ def main(argv=None): error("Could not clone tunnel. Please see http://www.belledonne-communications.com/voiptunnel.html") return 1 warning("Tunnel enabled, disabling GPL third parties.") - additional_args += ["-DENABLE_TUNNEL=ON", "-DENABLE_GPL_THIRD_PARTIES=OFF"] + additional_args += ["-DENABLE_TUNNEL=ON", "-DENABLE_GPL_THIRD_PARTIES=OFF", "-DENABLE_FFMPEG=NO"] # User's options are priority upon all automatic options additional_args += additional_args2