fix bad merge

This commit is contained in:
Simon Morlat 2011-01-18 16:43:14 +01:00
parent 68f44409c9
commit b8221a048d

View 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){