FS-5714 --resolve

Conflicts:
	libs/sofia-sip/.update

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 264ebfa88ec29d66eab41219f33a0d1f1f7ef9b1..aafaa52777271fca5b82e2566b54d22eb94656ba 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Thu Sep  5 20:41:14 CDT 2013
+Thu Sep  5 20:56:36 CDT 2013

diff --git a/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c b/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c
index 416f262c0310af111107e9cfc48b73f0961d2d10..02b9a5c5a7a4b0228a2e41095dd030b4d8b6539a 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c
@@ -620,7 +620,7 @@ static void print_media(sdp_printer_t *p,
     else {
                /* SDP syntax requires at least one format. */
                /* defaults to "19", or "t38" for image */
-               if (m->m_image == sdp_media_image) sdp_printf(p, " t38");
+               if (m->m_type == sdp_media_image) sdp_printf(p, " t38");
                else sdp_printf(p, " 19");
     }