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

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 60a9127b2454cb8ef9eeaec5d64559af7e0861d6..fff77468b68c2821e28682c16c2f4693d37a2d6d 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -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:

diff --git a/mediastreamer2 b/mediastreamer2
index 1e6aa8adcf1e5c1a74b7fafaada43c5baedaa872..85886f326d404708368f72f69c8e0b67af417da1 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 1e6aa8adcf1e5c1a74b7fafaada43c5baedaa872
+Subproject commit 85886f326d404708368f72f69c8e0b67af417da1