Merge branch 'master' of git.linphone.org:linphone-private

This commit is contained in:
Jehan Monnier 2010-05-04 18:13:04 +02:00
commit 2044497521
2 changed files with 2 additions and 1 deletions

View file

@ -1031,6 +1031,7 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta
linphone_core_assign_payload_type(&payload_type_speex_uwb,112,"vbr=on");
linphone_core_assign_payload_type(&payload_type_telephone_event,101,"0-11");
linphone_core_assign_payload_type(&payload_type_ilbc,113,"mode=30");
linphone_core_assign_payload_type(&payload_type_amr,114,"octet-align=1");
#ifdef ENABLE_NONSTANDARD_GSM
{

@ -1 +1 @@
Subproject commit 0ca839b53751c4b687535bcfae747273f3dd0c44
Subproject commit b340a76e998c7dd2670372212b0bf14d7c59b987