[Asterisk-cvs] asterisk rtp.c,1.92.2.7,1.92.2.8

[russell at lists.digium.com]

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

Modified Files:
      Tag: v1-0
	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.92.2.7
retrieving revision 1.92.2.8
diff -u -d -r1.92.2.7 -r1.92.2.8
--- rtp.c	19 Jan 2005 02:33:54 -0000	1.92.2.7
+++ rtp.c	25 Mar 2005 23:41:13 -0000	1.92.2.8
@@ -625,7 +625,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 */
@@ -645,6 +647,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 */
 };