[svn-commits] file: branch oej/earlyrtpfix r53106 - in /team/oej/earlyrtpfix: ./ channels/

[svn-commits at lists.digium.com]

Author: file
Date: Thu Feb  1 16:27:25 2007
New Revision: 53106

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53106
Log:
Merged revisions 53104 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r53104 | file | 2007-02-01 16:24:32 -0600 (Thu, 01 Feb 2007) | 10 lines

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

........
r53103 | file | 2007-02-01 16:21:56 -0600 (Thu, 01 Feb 2007) | 2 lines

Copy noncodeccapability over to the joint variable so that telephone-event will get transmitted in the sent INVITE.

........

................

Modified:
    team/oej/earlyrtpfix/   (props changed)
    team/oej/earlyrtpfix/channels/chan_sip.c

Propchange: team/oej/earlyrtpfix/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/earlyrtpfix/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb  1 16:27:25 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-53100
+/branches/1.4:1-53105

Modified: team/oej/earlyrtpfix/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/earlyrtpfix/channels/chan_sip.c?view=diff&rev=53106&r1=53105&r2=53106
==============================================================================
--- team/oej/earlyrtpfix/channels/chan_sip.c (original)
+++ team/oej/earlyrtpfix/channels/chan_sip.c Thu Feb  1 16:27:25 2007
@@ -2836,6 +2836,7 @@
 	if ( res != -1 ) {
 		p->callingpres = ast->cid.cid_pres;
 		p->jointcapability = ast_translate_available_formats(p->capability, p->prefcodec);
+		p->jointnoncodeccapability = p->noncodeccapability;
 
 		/* If there are no audio formats left to offer, punt */
 		if (!(p->jointcapability & AST_FORMAT_AUDIO_MASK)) {