diff options
| author | Joshua Colp <jcolp@digium.com> | 2013-12-03 18:01:36 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2013-12-03 18:01:36 +0000 |
| commit | b8025e789de01ffa20214499e57b017db1f91f03 (patch) | |
| tree | 2c13f7db3f8798468285f3142c763a680e32eb0c /res | |
| parent | 3357c494cb21f24b7185ee3b255bc0cd72d48a55 (diff) | |
res_pjsip_session: Add support for PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE flag.
Newer versions of PJSIP have changed to using a flag for the
PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE instead of a define. This adds a
configure check to detect the presence of the flag and use it if found.
........
Merged revisions 403329 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip_session.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c index 7ffc88961..cc387d124 100644 --- a/res/res_pjsip_session.c +++ b/res/res_pjsip_session.c @@ -1222,7 +1222,7 @@ struct ast_sip_session *ast_sip_session_create_outgoing(struct ast_sip_endpoint pjsip_dlg_terminate(dlg); return NULL; } -#ifdef PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE +#if defined(HAVE_PJSIP_REPLACE_MEDIA_STREAM) || defined(PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE) inv_session->sdp_neg_flags = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE; #endif @@ -1371,7 +1371,8 @@ static pjsip_inv_session *pre_session_setup(pjsip_rx_data *rdata, const struct a pjsip_dlg_terminate(dlg); return NULL; } -#ifdef PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE + +#if defined(HAVE_PJSIP_REPLACE_MEDIA_STREAM) || defined(PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE) inv_session->sdp_neg_flags = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE; #endif if (pjsip_dlg_add_usage(dlg, &session_module, NULL) != PJ_SUCCESS) { |