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

configure.in

@@ -1,6 +1,6 @@
 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

coreapi/exevents.c

@@ -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);
 		}

coreapi/linphonecore.c

@@ -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
 	{