From 4bc6556a15e16e5248ba5dc776c5ced4f4fb3f38 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Fri, 18 Oct 2013 10:39:00 +0200 Subject: [PATCH] Re-enable ffmpeg in master + typo in veryclean --- submodules/build/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/build/Makefile b/submodules/build/Makefile index af28aedc6..2773dbd8a 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -21,7 +21,7 @@ ############################################################################ enable_gpl_third_parties=yes enable_zrtp=no -enable_ffmpeg=no +enable_ffmpeg=yes enable_opus=yes enable_debug=no @@ -101,5 +101,5 @@ clean-makefile: veryclean: make -f builder-iphone-simulator.mk veryclean \ && make -f builder-iphone-os.mk veryclean \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin veryclean \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin veryclean