From: Joshua Colp <jcolp@digium.com>
Date: Thu, 1 Aug 2013 11:21:28 +0000 (+0000)
Subject: Answer with multiple codecs if the underlying pjproject supports it.
X-Git-Tag: 13.0.0-beta1~1373
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c1396946929ab19e94c117f8ad3db5f78a450bc;p=thirdparty%2Fasterisk.git

Answer with multiple codecs if the underlying pjproject supports it.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395938 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index fd136082df..13c1e1d6e1 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -947,6 +947,9 @@ int ast_sip_session_create_invite(struct ast_sip_session *session, pjsip_tx_data
 
 	pjsip_inv_set_local_sdp(session->inv_session, offer);
 	pjmedia_sdp_neg_set_prefer_remote_codec_order(session->inv_session->neg, PJ_FALSE);
+#ifdef PJMEDIA_SDP_NEG_ANSWER_MULTIPLE_CODECS
+	pjmedia_sdp_neg_set_answer_multiple_codecs(session->inv_session->neg, PJ_TRUE);
+#endif
 	if (pjsip_inv_invite(session->inv_session, tdata) != PJ_SUCCESS) {
 		return -1;
 	}
@@ -1459,6 +1462,9 @@ static int new_invite(void *data)
 	} else {
 		pjsip_inv_set_local_sdp(invite->session->inv_session, local);
 		pjmedia_sdp_neg_set_prefer_remote_codec_order(invite->session->inv_session->neg, PJ_FALSE);
+#ifdef PJMEDIA_SDP_NEG_ANSWER_MULTIPLE_CODECS
+		pjmedia_sdp_neg_set_answer_multiple_codecs(invite->session->inv_session->neg, PJ_TRUE);
+#endif
 	}
 
 	pjsip_timer_setting_default(&timer);