Merge branch 'dev_sal' of belledonne-communications.com:linphone-private into dev_sal

Conflicts:
	mediastreamer2
This commit is contained in:
Jehan Monnier 2010-03-25 15:42:54 +01:00
commit 56f25e6225

View file

@ -968,7 +968,7 @@ static bool_t call_failure(Sal *sal, eXosip_event_t *ev){
sr=SalReasonUnknown;
}else error=SalErrorNoResponse;
}
if (code!=487) sal->callbacks.call_failure(op,error,sr,reason);
sal->callbacks.call_failure(op,error,sr,reason);
return TRUE;
}