Index: channels/chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.704
diff -u -r1.704 chan_sip.c
--- channels/chan_sip.c	13 Apr 2005 18:46:35 -0000	1.704
+++ channels/chan_sip.c	19 Apr 2005 21:03:59 -0000
@@ -2997,6 +2997,7 @@
 	/* Now gather all of the codecs that were asked for: */
 	ast_rtp_get_current_formats(p->rtp,
 				&peercapability, &peernoncodeccapability);
+	peernoncodeccapability &= p->noncodeccapability;
 	if (p->vrtp)
 		ast_rtp_get_current_formats(p->vrtp,
 				&vpeercapability, &vpeernoncodeccapability);