From 2630a9b0f0b4cfccf0f7c84ac0b81eca22176023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 15 Oct 2014 12:44:52 +0200 Subject: [PATCH] Fix compilation on Android --- build/android/Android.mk | 2 +- coreapi/linphonecore_jni.cc | 2 +- mediastreamer2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/android/Android.mk b/build/android/Android.mk index 1edc91fac..e634d3fa0 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -69,7 +69,7 @@ LOCAL_SRC_FILES := \ call_log.c \ call_params.c \ player.c \ - fileplayer.c + localplayer.c ifndef LIBLINPHONE_VERSION LIBLINPHONE_VERSION = "Devel" diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index c1cc56e47..eb90870eb 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -28,7 +28,7 @@ extern "C" { #include "mediastreamer2/mediastream.h" #include "mediastreamer2/mscommon.h" #include "mediastreamer2/dsptools.h" -#include "mediastreamer2/fileplayer.h" +#include "mediastreamer2/msmediaplayer.h" } #include "mediastreamer2/msjava.h" #include "private.h" diff --git a/mediastreamer2 b/mediastreamer2 index 04fa73768..83bceea35 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 04fa73768107968abf6ff8440e5dff20f6a4a0c9 +Subproject commit 83bceea35319df31971ae3dede509f02fdf7df9b