diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index d80ab4e81..fddd8886a 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -111,7 +111,7 @@ void linphone_call_update_frozen_payloads(LinphoneCall *call, SalMediaDescriptio
 				/*new codec, needs to be added to the list*/
 				local->streams[i].already_assigned_payloads=ms_list_append(local->streams[i].already_assigned_payloads, payload_type_clone(pt));
 				ms_message("LinphoneCall[%p] : payload type %i %s/%i fmtp=%s added to frozen list.",
-					   call, payload_type_get_number(pt), pt->mime_type, pt->clock_rate, pt->recv_fmtp ? pt->recv_fmtp : NULL);
+					   call, payload_type_get_number(pt), pt->mime_type, pt->clock_rate, pt->recv_fmtp ? pt->recv_fmtp : "");
 			}
 		}
 	}
diff --git a/mediastreamer2 b/mediastreamer2
index 15bb0cb09..7494e580b 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 15bb0cb09255a73e2632b7e357d2b66060f2b013
+Subproject commit 7494e580b6127b950f29a5dff731789ed605b3a6
diff --git a/oRTP b/oRTP
index ef3258413..d9377cb47 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit ef3258413d81f38033b15cb14362be26471d96d3
+Subproject commit d9377cb47177cd92d2a1971cd389221aeebcabde