From 1a36ff6b9699253c966e0c0258e21045585fb384 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 19 Jan 2016 17:50:37 +0100
Subject: [PATCH] fix android build

---
 coreapi/linphonecore_jni.cc | 2 +-
 mediastreamer2              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index f23bce3a8..98b60209f 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -110,7 +110,7 @@ void linphone_android_log_handler(int prio, char *str) {
 	}
 }
 
-static void linphone_android_ortp_log_handler(OrtpLogLevel lev, const char *fmt, va_list args) {
+static void linphone_android_ortp_log_handler(const char *domain, OrtpLogLevel lev, const char *fmt, va_list args) {
 	char str[4096];
 	const char *levname="undef";
 	vsnprintf(str, sizeof(str) - 1, fmt, args);
diff --git a/mediastreamer2 b/mediastreamer2
index 2e78b3514..3d08d4ddd 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 2e78b3514324ae6311f437926e5ff2fc2da09344
+Subproject commit 3d08d4ddd56120d1434139e59bbf7ef0f8b2f9c4