kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 16:39:14 +00:00
Code Issues Projects Releases Wiki Activity

FS-3957 --resolve

Browse Source
This commit is contained in:
Anthony Minessale 2012-03-01 10:04:07 -06:00
parent 5e906e8eaa
commit 872a0fe658
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Wed Feb 29 14:45:18 CST 2012 Thu Mar 1 10:03:45 CST 2012

12
libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c
View File

@ -1875,10 +1875,11 @@ sdp_rtpmap_t *sdp_rtpmap_find_matching(sdp_rtpmap_t const *list,
sdp_rtpmap_t const *rm) sdp_rtpmap_t const *rm)
{ {
char const *lparam, *rparam; char const *lparam, *rparam;
sdp_rtpmap_t const *cp_list = NULL;
if (rm == NULL) if (rm == NULL)
return NULL; return NULL;
for (; list; list = list->rm_next) { for (; list; list = list->rm_next) {
if (rm->rm_rate != list->rm_rate) if (rm->rm_rate != list->rm_rate)
continue; continue;
@ -1888,8 +1889,11 @@ sdp_rtpmap_t *sdp_rtpmap_find_matching(sdp_rtpmap_t const *list,
lparam = rm->rm_params; rparam = list->rm_params; lparam = rm->rm_params; rparam = list->rm_params;
if (lparam == rparam) if (lparam == rparam) {
break; cp_list = list;
if (rm->rm_pt != list->rm_pt) continue;
break;
}
if (!lparam) lparam = "1"; if (!rparam) rparam = "1"; if (!lparam) lparam = "1"; if (!rparam) rparam = "1";
if (!su_casematch(lparam, rparam)) if (!su_casematch(lparam, rparam))
@ -1898,5 +1902,5 @@ sdp_rtpmap_t *sdp_rtpmap_find_matching(sdp_rtpmap_t const *list,
break; break;
} }
return (sdp_rtpmap_t *)list; return cp_list ? (sdp_rtpmap_t *) cp_list : (sdp_rtpmap_t *)list;
} }