diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 22de34ae4..f12bb6200 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -2233,9 +2233,9 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho
 #ifdef VIDEO_ENABLED
 		if (call->videostream!=NULL){
 			video_stream_set_sent_video_size(call->videostream,linphone_core_get_preferred_video_size(lc));
-			if (call->camera_active)
-				call->videostream->cam=lc->video_conf.device; /*to take into account eventual cam changes*/
-			video_stream_update_video_params (call->videostream);
+			if (call->camera_active && call->videostream->cam!=lc->video_conf.device){
+				video_stream_change_camera(call->videostream,lc->video_conf.device);
+			}else video_stream_update_video_params(call->videostream);
 		}
 #endif
 	}
diff --git a/mediastreamer2 b/mediastreamer2
index ed88d302d..9e7e1e64e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit ed88d302d5c3ab8c4dec32e24f5ef375e81654f7
+Subproject commit 9e7e1e64ef6287184f8d1642a52e60ad1838b30e