[asterisk-commits] trunk r9959 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue Feb 14 12:30:32 2006
New Revision: 9959

URL: http://svn.digium.com/view/asterisk?rev=9959&view=rev
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=9959&r1=9958&r2=9959&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Feb 14 12:30:32 2006
@@ -4492,7 +4492,7 @@
 		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();