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

diff --cc coreapi/linphonecore.c
index 40d4257b0c98e71430d9dbf043eb801c16b15cf8,88c1ad73afc61db9a4a915b4b959ec460ac87090..5e27defb0f5059f4334fadae0e64ba22fdfc0dff
--- 1/coreapi/linphonecore.c
--- 2/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@@ -2184,8 -2184,8 +2184,9 @@@ int linphone_core_update_call(LinphoneC
                        lc->vtable.display_status(lc,_("Modifying call parameters..."));
                sal_call_set_local_media_description (call->op,call->localdesc);
                err=sal_call_update(call->op);
+ #ifdef VIDEO_ENABLED
        }else{
 +#ifdef VIDEO_ENABLED
                if (call->videostream!=NULL){
                        video_stream_set_sent_video_size(call->videostream,linphone_core_get_preferred_video_size(lc));
                        video_stream_update_video_params (call->videostream);