From 7d6d9cf6764be311686935077386d0e9cb4d6076 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 5 Jul 2011 17:31:58 +0200
Subject: [PATCH] fix Android.mk file

---
 jni/Application.mk                                      | 9 ++++-----
 submodules/externals/build/ffmpeg/Android_libavcodec.mk | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jni/Application.mk b/jni/Application.mk
index 627f0b9a4..5173eb3b7 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -6,11 +6,11 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 APP_MODULES      +=libmsilbc 
 endif
 
-ifneq ($(LINPHONE_VIDEO),0)
+ifeq ($(LINPHONE_VIDEO),1)
 APP_MODULES += libavutil libavcore libavcodec libswscale
 endif
 
-ifneq ($(BUILD_AMR),0)
+ifeq ($(BUILD_AMR),1)
 APP_MODULES += libopencoreamr libmsamr
 endif
 
@@ -18,7 +18,7 @@ ifeq ($(WITH_OPENSSL),1)
 APP_MODULES += libcrypto libssl
 endif
 
-ifneq ($(BUILD_X264),0)
+ifeq ($(BUILD_X264),1)
 APP_MODULES +=libx264 libmsx264
 endif
 
@@ -29,5 +29,4 @@ endif
 APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
 APP_PLATFORM := android-8
 APP_ABI := armeabi armeabi-v7a
-#APP_OPTIM := debug
-
+APP_CFLAGS:=-DDISABLE_NEON
diff --git a/submodules/externals/build/ffmpeg/Android_libavcodec.mk b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
index 773bd39d6..ef2de0ac0 100755
--- a/submodules/externals/build/ffmpeg/Android_libavcodec.mk
+++ b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
@@ -87,6 +87,7 @@ LOCAL_SRC_FILES = \
 	libavcodec/resample2.c \
 	libavcodec/simple_idct.c \
 	libavcodec/utils.c \
+	libavcodec/svq3.c \
 	libavcodec/pthread.c