diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index c80810ba4..5202108b7 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -197,6 +197,7 @@ static MSList *make_codec_list(LinphoneCore *lc, const MSList *codecs, int bandw
 	if (max_sample_rate) *max_sample_rate=0;
 	for(it=codecs;it!=NULL;it=it->next){
 		PayloadType *pt=(PayloadType*)it->data;
+		payload_type_unset_flag(pt, PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED); /* Disable AVPF for the moment. */
 		if (pt->flags & PAYLOAD_TYPE_ENABLED){
 			if (bandwidth_limit>0 && !linphone_core_is_payload_type_usable_for_bandwidth(lc,pt,bandwidth_limit)){
 				ms_message("Codec %s/%i eliminated because of audio bandwidth constraint of %i kbit/s",
diff --git a/mediastreamer2 b/mediastreamer2
index d51333b63..dacf94968 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit d51333b63b6f61c96bb861ad07e8165321c50f59
+Subproject commit dacf949689d0583fcacd28de316d0c8f05107452