mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-23 14:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev_bb10'

Browse source 
Conflicts:
	mediastreamer2
	oRTP
This commit is contained in:
Sylvain Berfini 2015-08-13 16:33:16 +02:00
commit 6ef6e97043
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coreapi/callbacks.c
View file

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

2
coreapi/lpconfig.c
View file

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

2
mediastreamer2

@ -1 +1 @@
Subproject commit cbdcaacbb6a4938c2c5997049b4f701c664aa0f1
Subproject commit 998cdbcc79e6871b3029961d1d696bc04aedfefb

2
oRTP

@ -1 +1 @@
Subproject commit f67e171862419ade638d1abf0a609877febec1e9
Subproject commit 714ae33119397055bc0509ea78a3651a3d1b58d5