diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index e0a012ceb..4c7147db4 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -127,7 +127,9 @@ static PayloadTypeMatcher matchers[]={
 };
 
 
-
+/*
+ * Returns a PayloadType from the local list that matches a PayloadType offered or answered in the remote list
+*/
 static PayloadType * find_payload_type_best_match(const MSList *l, const PayloadType *refpt){
 	PayloadTypeMatcher *m;
 	for(m=matchers;m->mime_type!=NULL;++m){
@@ -162,8 +164,9 @@ static MSList *match_payloads(const MSList *local, const MSList *remote, bool_t
 			}
 
 			newp=payload_type_clone(matched);
-			if (p2->send_fmtp)
-				payload_type_set_send_fmtp(newp,p2->send_fmtp);
+			if (p2->send_fmtp){
+				payload_type_append_send_fmtp(newp,p2->send_fmtp);
+			}
 			newp->flags|=PAYLOAD_TYPE_FLAG_CAN_RECV|PAYLOAD_TYPE_FLAG_CAN_SEND;
 			if (p2->flags & PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED) {
 				newp->flags |= PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED;
diff --git a/mediastreamer2 b/mediastreamer2
index 0ebccd5f6..bf2d8b08e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0ebccd5f6f844ecfae865c7d2ef1133405b4ecde
+Subproject commit bf2d8b08ec0200175580ce94404e52dae266bf69
diff --git a/oRTP b/oRTP
index 8cac6a399..327cec466 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 8cac6a399755001f5df7a933bc26c7b9629981fc
+Subproject commit 327cec466a5d39e716664325ae6d604e228b3fed