From c6ceda063e109bc980aa95ae8bc88b9f1aeb711b Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 27 Nov 2013 16:24:59 +0100
Subject: [PATCH] Update Mediastreamer2 Add flag to compile with contact header
 in android

---
 build/android/Android.mk | 4 ++++
 mediastreamer2           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/android/Android.mk b/build/android/Android.mk
index 235056c54..e9c9fa1f6 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -85,6 +85,10 @@ LOCAL_CFLAGS += -DHAVE_X264
 endif
 endif
 
+ifeq ($(BUILD_CONTACT_HEADER),1)
+LOCAL_CFLAGS += -DSAL_OP_CALL_FORCE_CONTACT_IN_RINGING
+endif
+
 ifeq ($(USE_JAVAH),1)
 LOCAL_CFLAGS += -DUSE_JAVAH
 endif
diff --git a/mediastreamer2 b/mediastreamer2
index 9a7e57405..f8cba9686 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 9a7e57405031f92e2a46c294592bd89ec41ef25a
+Subproject commit f8cba968622ce3400d2c67bfb8a248ef48363627