mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-29 06:36:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Jehan Monnier 2010-01-29 17:10:30 +01:00
commit a4a00f63e4
4 changed files with 2063 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script. 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 AC_CANONICAL_SYSTEM
dnl Source packaging numbers dnl Source packaging numbers

4
coreapi/exevents.c
View file

@ -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.pt=rtp_profile_get_payload_number_from_rtpmap(lc->local_profile,payload.a_rtpmap);
payload.localport=call->audio_params.natd_port > 0 ? payload.localport=call->audio_params.natd_port > 0 ?
call->audio_params.natd_port : lc->rtp_conf.audio_rtp_port; 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); sdp_context_add_audio_payload(ctx,&payload);
ms_free(payload.a_rtpmap); ms_free(payload.a_rtpmap);
} }

2
coreapi/linphonecore.c
View file

@ -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_wb,111,"vbr=on");
linphone_core_assign_payload_type(&payload_type_speex_uwb,112,"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_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 #ifdef ENABLE_NONSTANDARD_GSM
{ {

2061
po/ru.po Normal file
View file

File diff suppressed because it is too large Load diff