diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 40c3e197b..2a98afef1 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2177,6 +2177,7 @@ static void linphone_call_start_video_stream(LinphoneCall *call, const char *cna
 				ms_message("%s lc rotation:%d\n", __FUNCTION__, lc->device_rotation);
 				video_stream_set_device_rotation(call->videostream, lc->device_rotation);
 				video_stream_set_rtcp_information(call->videostream, cname, rtcp_tool);
+				video_stream_set_freeze_on_error(call->videostream, lp_config_get_int(lc->config, "video", "freeze_on_error", 0));
 				video_stream_start(call->videostream,
 					call->video_profile, rtp_addr, vstream->rtp_port,
 					rtcp_addr,
diff --git a/mediastreamer2 b/mediastreamer2
index 7a627f30b..9c9d88041 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7a627f30b0462574290e03e99983327e6ea987dc
+Subproject commit 9c9d88041cc8859c115a706f5cd7211434336531