From: Kevin P. Fleming <kpfleming@digium.com>
Date: Tue, 14 Feb 2006 18:30:32 +0000 (+0000)
Subject: Merged revisions 9958 via svnmerge from
X-Git-Tag: 1.4.0-beta1~2632
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7616d69a63a4e12d034a5fd1ddcb7099dd9ecc15;p=thirdparty%2Fasterisk.git

Merged revisions 9958 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r9958 | kpfleming | 2006-02-14 12:30:10 -0600 (Tue, 14 Feb 2006) | 2 lines

when answering INVITE, don't send codecs the peer didn't offer (issue #6052)

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d896fa9dd4..468514a961 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4492,7 +4492,7 @@ static int add_sdp(struct sip_request *resp, struct sip_pvt *p)
 		ast_log(LOG_WARNING, "No way to add SDP without an RTP structure\n");
 		return -1;
 	}
-	capability = p->capability;
+	capability = p->jointcapability;
 		
 	if (!p->sessionid) {
 		p->sessionid = getpid();