From: Automerge Script <automerge@asterisk.org>
Date: Thu, 24 May 2007 15:24:07 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.19-netsec~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f008f7914ded7ca24c333d8a408f024204272196;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@65900 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ab11cb8147..8ebb1e914d 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3220,6 +3220,7 @@ static struct sip_pvt *sip_alloc(char *callid, struct sockaddr_in *sin, int useg
 	p->capability = global_capability;
 	if ((ast_test_flag(p, SIP_DTMF) == SIP_DTMF_RFC2833) || (ast_test_flag(p, SIP_DTMF) == SIP_DTMF_AUTO))
 		p->noncodeccapability |= AST_RTP_DTMF;
+	p->jointnoncodeccapability = p->noncodeccapability;
 	strcpy(p->context, default_context);
 
 	/* Add to active dialog list */