From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 25 Mar 2005 23:41:13 +0000 (+0000)
Subject: Don't use deprecated "2" location for G.726 (rfc3551)
X-Git-Tag: 1.0.11.1~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d056623e6062a12a07eda3bb5ddd646662b8d454;p=thirdparty%2Fasterisk.git

Don't use deprecated "2" location for G.726 (rfc3551)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/rtp.c b/rtp.c
index 9b40b7980c..b21d7dbac7 100755
--- a/rtp.c
+++ b/rtp.c
@@ -625,7 +625,9 @@ static struct {
    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 @@ static struct rtpPayloadType static_RTP_PT[MAX_RTP_PT] = {
   [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 */
 };