[Asterisk-cvs] asterisk rtp.c,1.115,1.116

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv5670

Modified Files:
	rtp.c 
Log Message:
Don't use deprecated "2" location for G.726 (rfc3551)


Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- rtp.c	24 Mar 2005 22:00:23 -0000	1.115
+++ rtp.c	25 Mar 2005 21:01:11 -0000	1.116
@@ -674,7 +674,9 @@
    table for transmission */
 static struct rtpPayloadType static_RTP_PT[MAX_RTP_PT] = {
   [0] = {1, AST_FORMAT_ULAW},
+#ifdef USE_DEPRECATED_G726
   [2] = {1, AST_FORMAT_G726}, /* Technically this is G.721, but if Cisco can do it, so can we... */
+#endif
   [3] = {1, AST_FORMAT_GSM},
   [4] = {1, AST_FORMAT_G723_1},
   [5] = {1, AST_FORMAT_ADPCM}, /* 8 kHz */
@@ -695,6 +697,7 @@
   [97] = {1, AST_FORMAT_ILBC},
   [101] = {0, AST_RTP_DTMF},
   [110] = {1, AST_FORMAT_SPEEX},
+  [111] = {1, AST_FORMAT_G726},
   [121] = {0, AST_RTP_CISCO_DTMF}, /* Must be type 121 */
 };