[Asterisk-cvs] asterisk/channels chan_sip.c,1.468,1.469

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory localhost.localdomain:/tmp/cvs-serv7684/channels

Modified Files:
	chan_sip.c 
Log Message:
Merge Lenny's sorcery....


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -d -r1.468 -r1.469
--- chan_sip.c	8 Aug 2004 17:15:02 -0000	1.468
+++ chan_sip.c	17 Aug 2004 01:57:16 -0000	1.469
@@ -3403,7 +3403,7 @@
 		cur = cur->next;
 	}
 	/* Now send any other common codecs, and non-codec formats: */
-	for (x = 1; x <= (videosupport ? AST_FORMAT_MAX_VIDEO : AST_FORMAT_MAX_AUDIO); x <<= 1) {
+	for (x = 1; x <= ((videosupport && p->vrtp) ? AST_FORMAT_MAX_VIDEO : AST_FORMAT_MAX_AUDIO); x <<= 1) {
 		if ((capability & x) && !(alreadysent & x)) {
 			if (debug)
 				ast_verbose("Answering with capability 0x%x(%s)\n", x, ast_getformatname(x));