From b8221a048d201625cd0480402e261844790066be Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 18 Jan 2011 16:43:14 +0100
Subject: [PATCH] fix bad merge

---
 coreapi/linphonecore.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 5e27defb0..40d4257b0 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -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){