From efd549ee4b78986cf4668ca546b217f8f64c4793 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 8 Apr 2014 09:29:55 +0200 Subject: [PATCH] Do not build openh264 by default for now. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c5f0e70bb..c3d114f81 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ ENABLE_GPL_THIRD_PARTIES=1 #default options, can be overidden using make OPTION=value . ifeq ($(ENABLE_GPL_THIRD_PARTIES),1) -BUILD_X264=0 +BUILD_X264=1 BUILD_G729=1 else #x264 and g729 requires additional licensing agreements. @@ -43,7 +43,7 @@ endif NDK_DEBUG=0 BUILD_VIDEO=1 -BUILD_OPENH264=1 +BUILD_OPENH264=0 BUILD_UPNP=1 BUILD_AMRNB=full # 0, light or full BUILD_AMRWB=1