Commit 92f082ab authored by Simon Morlat's avatar Simon Morlat

Merge branch 'master' into dev_sal

Conflicts:
	po/ru.po
parents 907cd9a4 857722d3
dnl Process this file with autoconf to produce a configure script.
AC_INIT([linphone],[3.2.1],[linphone-developers@nongnu.org])
AC_INIT([linphone],[3.2.99],[linphone-developers@nongnu.org])
AC_CANONICAL_SYSTEM
dnl Source packaging numbers
......
......@@ -34,7 +34,7 @@ static bool_t linphone_call_matches_event(LinphoneCall *call, eXosip_event_t *ev
static void linphone_call_proceeding(LinphoneCore *lc, eXosip_event_t *ev){
if (lc->call==NULL || (lc->call->cid!=-1 && !linphone_call_matches_event(lc->call,ev)) ) {
ms_warning("This call has been canceled: call=%p, call->cid=%i, ev->cid=%i",
lc->call,lc->call->cid,ev->cid);
lc->call,lc->call?lc->call->cid:-1,ev->cid);
eXosip_lock();
eXosip_call_terminate(ev->cid,ev->did);
eXosip_unlock();
......@@ -214,7 +214,7 @@ int linphone_call_failure(LinphoneCore *lc, eXosip_event_t *ev)
}*/
lc->vtable.display_message(lc,tmpmsg);
break;
case 487:
case 487: /*request terminated*/
lc->vtable.display_status(lc,msg487);
break;
case 600:
......@@ -244,7 +244,7 @@ int linphone_call_failure(LinphoneCore *lc, eXosip_event_t *ev)
linphone_core_stop_media_streams(lc);
if (call!=NULL) {
linphone_call_destroy(call);
gstate_new_state(lc, GSTATE_CALL_ERROR, NULL);
if (code!=487) gstate_new_state(lc, GSTATE_CALL_ERROR, NULL);
lc->call=NULL;
}
return 0;
......@@ -470,10 +470,6 @@ int linphone_set_audio_offer(sdp_context_t *ctx)
payload.pt=rtp_profile_get_payload_number_from_rtpmap(lc->local_profile,payload.a_rtpmap);
payload.localport=call->audio_params.natd_port > 0 ?
call->audio_params.natd_port : lc->rtp_conf.audio_rtp_port;
if (strcasecmp(codec->mime_type,"iLBC")==0){
/* prefer the 30 ms mode */
payload.a_fmtp="ptime=30";
}
sdp_context_add_audio_payload(ctx,&payload);
ms_free(payload.a_rtpmap);
}
......
......@@ -894,7 +894,7 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta
linphone_core_assign_payload_type(&payload_type_speex_wb,111,"vbr=on");
linphone_core_assign_payload_type(&payload_type_speex_uwb,112,"vbr=on");
linphone_core_assign_payload_type(&payload_type_telephone_event,101,NULL);
linphone_core_assign_payload_type(&payload_type_ilbc,113,NULL);
linphone_core_assign_payload_type(&payload_type_ilbc,113,"mode=30");
#ifdef ENABLE_NONSTANDARD_GSM
{
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment