Author: mjordan
Date: Sat Oct 18 19:56:43 2014
New Revision: 425924
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=425924
Log: (empty)
Modified:
trunk/ (props changed)
trunk/res/res_pjsip_sdp_rtp.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.
Modified: trunk/res/res_pjsip_sdp_rtp.c
URL:
http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_sdp_rtp.c?view=diff&rev=425924&r1=425923&r2=425924
==============================================================================
--- trunk/res/res_pjsip_sdp_rtp.c (original)
+++ trunk/res/res_pjsip_sdp_rtp.c Sat Oct 18 19:56:43 2014
@@ -899,13 +899,11 @@
int rtp_code;
RAII_VAR(struct ast_format_cap *, caps, NULL, ao2_cleanup);
enum ast_media_type media_type =
stream_to_media_type(session_media->stream_type);
- int use_override_prefs = ast_format_cap_count(session->req_caps);
-
int direct_media_enabled =
!ast_sockaddr_isnull(&session_media->direct_media_addr) &&
ast_format_cap_count(session->direct_media_cap);
- if ((use_override_prefs && !ast_format_cap_has_type(session->req_caps,
media_type)) ||
- (!use_override_prefs &&
!ast_format_cap_has_type(session->endpoint->media.codecs, media_type))) {
+ if (!ast_format_cap_has_type(session->endpoint->media.codecs,
media_type) ||
+ !ast_format_cap_has_type(session->req_caps, media_type)) {
/* If no type formats are configured don't add a stream */
return 0;
} else if (!session_media->rtp && create_rtp(session, session_media,
session->endpoint->media.rtp.ipv6)) {
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
