]> sjero.net Git - linphone/commitdiff
fix bad merge
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 18 Jan 2011 15:43:14 +0000 (16:43 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 18 Jan 2011 15:43:14 +0000 (16:43 +0100)
coreapi/linphonecore.c

index 5e27defb0f5059f4334fadae0e64ba22fdfc0dff..40d4257b0c98e71430d9dbf043eb801c16b15cf8 100644 (file)
@@ -2184,7 +2184,6 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho
                        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){