FS-5855 please try lastest HEAD

Conflicts:
	libs/sofia-sip/.update
This commit is contained in:
Anthony Minessale 2013-10-08 12:10:36 -05:00
parent 12409dbeff
commit 9764fb33cd
2 changed files with 11 additions and 9 deletions

View File

@ -1 +1 @@
Fri Sep 20 00:39:20 CDT 2013
Tue Oct 8 23:05:34 CDT 2013

View File

@ -640,15 +640,17 @@ static void print_media(sdp_printer_t *p,
print_key(p, m->m_key);
for (rm = m->m_rtpmaps; rm; rm = rm->rm_next) {
if (!rm->rm_predef || p->pr_all_rtpmaps)
if (rm->rm_encoding && *rm->rm_encoding && (!rm->rm_predef || p->pr_all_rtpmaps)) {
sdp_printf(p, "a=rtpmap:%u %s/%lu%s%s" CRLF,
rm->rm_pt, rm->rm_encoding, rm->rm_rate,
rm->rm_params ? "/" : "",
rm->rm_params ? rm->rm_params : "");
if (rm->rm_fmtp)
}
if (rm->rm_fmtp) {
sdp_printf(p, "a=fmtp:%u %s" CRLF,
rm->rm_pt, rm->rm_fmtp);
}
}
if (!p->pr_mode_manual && !m->m_rejected &&
(m->m_mode != (unsigned int)session_mode || p->pr_mode_always)) {