Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
	coreapi/linphonecall.c

diff --cc coreapi/linphonecall.c
index f3b20a5b18602a5923d9347013708190fa186f13,bcde3270c9c96cdf91aef686a3942dc0b3177858..d41ab52067de0a240a44777132cafd3f2d7d61f3
--- 1/coreapi/linphonecall.c
--- 2/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@@ -1148,7 -1150,7 +1148,7 @@@ void linphone_call_start_media_streams(
        }
  #endif
        linphone_call_start_audio_stream(call,cname,all_inputs_muted,send_ringbacktone,use_arc);
--      linphone_call_start_video_stream(call,cname,all_inputs_muted);
++      if (call->videostream!=NULL) linphone_call_start_video_stream(call,cname,all_inputs_muted);
  
        call->all_muted=all_inputs_muted;
        call->playing_ringbacktone=send_ringbacktone;