From a74ded3be64f5f48fffd33e0b521139dec74a836 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 26 Mar 2015 14:57:13 +0100
Subject: [PATCH] fix audio-only build

---
 mediastreamer2      |  2 +-
 oRTP                |  2 +-
 tester/tester.c     | 13 +++++--------
 tools/Makefile.am   |  3 ++-
 tools/auto_answer.c |  9 +++++++--
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/mediastreamer2 b/mediastreamer2
index ea929123d..763daeec4 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit ea929123dc1ac4f7c9ade03be6a4e8c69635f26c
+Subproject commit 763daeec4bf74580a140b3572f50ab676c7926bf
diff --git a/oRTP b/oRTP
index c1d4d9fb0..235d9d5bd 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit c1d4d9fb000ed3208ebb2f5b79987dfb115f0c99
+Subproject commit 235d9d5bd7d78d16a078c1cb0e3029fc9522797f
diff --git a/tester/tester.c b/tester/tester.c
index 0b09afc3f..fe3054c0b 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -263,17 +263,14 @@ LinphoneCoreManager* linphone_core_manager_init(const char* rc_file) {
 	{
 		MSWebCam *cam;
 
-#ifdef _MSC_VER
-		extern __declspec(dllimport) MSWebCamDesc mire_desc;
-#else
-		extern MSWebCamDesc mire_desc;
-#endif
-
 		cam = ms_web_cam_manager_get_cam(ms_web_cam_manager_get(), "Mire: Mire (synthetic moving picture)");
 
 		if (cam == NULL) {
-			cam=ms_web_cam_new(&mire_desc);
-			ms_web_cam_manager_add_cam(ms_web_cam_manager_get(), cam);
+			MSWebCamDesc *desc = ms_mire_webcam_desc_get();
+			if (desc){
+				cam=ms_web_cam_new(desc);
+				ms_web_cam_manager_add_cam(ms_web_cam_manager_get(), cam);
+			}
 		}
 	}
 #endif
diff --git a/tools/Makefile.am b/tools/Makefile.am
index e10669bcb..ab76dddb2 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -45,7 +45,8 @@ lp_gen_wrappers_LDADD= \
 auto_answer_SOURCES=auto_answer.c
 auto_answer_CFLAGS=$(COMMON_CFLAGS)
 auto_answer_LDADD=\
-	$(top_builddir)/coreapi/liblinphone.la
+	$(top_builddir)/coreapi/liblinphone.la \
+	$(MEDIASTREAMER_LIBS)
 
 endif
 
diff --git a/tools/auto_answer.c b/tools/auto_answer.c
index 2ecb90263..573802de6 100644
--- a/tools/auto_answer.c
+++ b/tools/auto_answer.c
@@ -138,8 +138,13 @@ int main(int argc, char *argv[]){
 	linphone_core_set_play_file(lc,PACKAGE_DATA_DIR "/sounds/linphone/hello16000.wav");
 	linphone_core_set_use_files(lc,TRUE);
 
-	ms_web_cam_manager_add_cam(ms_web_cam_manager_get(),ms_web_cam_new(&mire_desc));
-	linphone_core_set_video_device(lc,"Mire: Mire (synthetic moving picture)");
+	{
+		MSWebCamDesc *desc = ms_mire_webcam_desc_get();
+		if (desc){
+			ms_web_cam_manager_add_cam(ms_web_cam_manager_get(),ms_web_cam_new(desc));
+			linphone_core_set_video_device(lc,"Mire: Mire (synthetic moving picture)");
+		}
+	}
 
 	if (!addr) {
 		addr = linphone_address_new("sip:bot@localhost:5060");