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 ab11cb8147a94987614bd22d6a8c72609078aa40..8ebb1e914dfe2f3ca3249773224644a0a52b8b50 100644 (file)
--- 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 */