diff --git a/coreapi/call_params.c b/coreapi/call_params.c
index a6731f28b..8acc33b19 100644
--- a/coreapi/call_params.c
+++ b/coreapi/call_params.c
@@ -105,7 +105,7 @@ void linphone_call_params_enable_low_bandwidth(LinphoneCallParams *cp, bool_t en
 
 void linphone_call_params_enable_video(LinphoneCallParams *cp, bool_t enabled){
 	cp->has_video=enabled;
-	if (cp->video_dir==LinphoneMediaDirectionInactive)
+	if (enabled && cp->video_dir==LinphoneMediaDirectionInactive)
 		cp->video_dir=LinphoneMediaDirectionSendRecv;
 }
 
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index bcf017da0..848f25761 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3587,7 +3587,7 @@ int _linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, cons
 		return 0;
 	}
 	if (params==NULL){
-		call->params->has_video=lc->video_policy.automatically_accept || call->current_params->has_video;
+		linphone_call_params_enable_video(call->params, lc->video_policy.automatically_accept || call->current_params->has_video);
 	}else
 		linphone_call_set_new_params(call,params);
 
diff --git a/mediastreamer2 b/mediastreamer2
index a92d90999..ac4fc4a44 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a92d909993d0f4fc3e8656e4f5ff4f51a4cfe8ca
+Subproject commit ac4fc4a447e73e50a044c2c9113ea00f72dd441a