From 86d2d9ffc3e7ba24083530bb781423c8abdec60c Mon Sep 17 00:00:00 2001
From: Sandrine Avakian <sandrine.avakian@belledonne-communications.com>
Date: Thu, 28 Jan 2016 14:49:20 +0100
Subject: [PATCH] Update media streamer and small fix for webcam.

---
 coreapi/linphonecall.c | 4 ++--
 mediastreamer2         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 94cf6d473..57ff6e775 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -48,9 +48,9 @@ static void _linphone_call_set_next_video_frame_decoded_trigger(LinphoneCall *ca
 void linphone_call_handle_stream_events(LinphoneCall *call, int stream_index);
 
 
-MSWebCam *get_nowebcam_device(){
+MSWebCam *get_nowebcam_device(MSFactory* f){
 #ifdef VIDEO_ENABLED
-	return ms_web_cam_manager_get_cam(ms_web_cam_manager_get(),"StaticImage: Static picture");
+	return ms_web_cam_manager_get_cam(ms_factory_get_wbc_manager(f),"StaticImage: Static picture");
 #else
 	return NULL;
 #endif
diff --git a/mediastreamer2 b/mediastreamer2
index b3b4e3248..9cd601595 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit b3b4e324874c58cd09e72d735396983fd01687b9
+Subproject commit 9cd601595fbd43aecbbdb4cda4360e25db880e5c