Commit fcb8e72a authored by Simon Morlat's avatar Simon Morlat
Browse files

Merge branch 'master' of git://git.savannah.nongnu.org/linphone

parents 456ad6df 48e95b61
......@@ -982,6 +982,7 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta
linphone_core_assign_payload_type(lc,&payload_type_speex_wb,111,"vbr=on");
linphone_core_assign_payload_type(lc,&payload_type_speex_uwb,112,"vbr=on");
linphone_core_assign_payload_type(lc,&payload_type_telephone_event,101,"0-11");
linphone_core_assign_payload_type(lc,&payload_type_g722,9,NULL);
#if defined(ANDROID) || defined (__IPHONE_OS_VERSION_MIN_REQUIRED)
/*shorten the DNS lookup time and send more retransmissions on mobiles:
......
mediastreamer2 @ 85886f32
Subproject commit 1e6aa8adcf1e5c1a74b7fafaada43c5baedaa872
Subproject commit 85886f326d404708368f72f69c8e0b67af417da1
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