diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index ecd931a59..618a14e59 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/coreapi/lpconfig.c b/coreapi/lpconfig.c index 891097245..c6062ae55 100644 --- a/coreapi/lpconfig.c +++ b/coreapi/lpconfig.c @@ -86,7 +86,7 @@ struct _LpConfig{ }; char* lp_realpath(const char* file, char* name) { -#ifdef _WIN32 +#if defined(_WIN32) || defined(__QNX__) return ms_strdup(file); #else char * output = realpath(file, name); diff --git a/mediastreamer2 b/mediastreamer2 index cbdcaacbb..998cdbcc7 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit cbdcaacbb6a4938c2c5997049b4f701c664aa0f1 +Subproject commit 998cdbcc79e6871b3029961d1d696bc04aedfefb diff --git a/oRTP b/oRTP index f67e17186..714ae3311 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit f67e171862419ade638d1abf0a609877febec1e9 +Subproject commit 714ae33119397055bc0509ea78a3651a3d1b58d5