summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2008-09-17 18:26:35 +0000
committerMark Michelson <mmichelson@digium.com>2008-09-17 18:26:35 +0000
commit224980b07b236cdc2e67ca3bd69940a9b92a8275 (patch)
tree0629c3b7a652b96c040f7af4a3e739728595520d /main
parent8af206ab23631995c5c540ef0767e8c0bff56a93 (diff)
Merged revisions 143337 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r143337 | mmichelson | 2008-09-17 13:24:15 -0500 (Wed, 17 Sep 2008) | 6 lines Allow for "G.729" if offered in an SDP even though it is not RFC 3551 compliant. Some Cisco switches will send this in an SDP, and it doesn't hurt to be able to accept this. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143340 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/rtp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/rtp.c b/main/rtp.c
index 2f4bca429..a05603f22 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -1865,6 +1865,7 @@ static struct {
{{1, AST_FORMAT_LPC10}, "audio", "LPC"},
{{1, AST_FORMAT_G729A}, "audio", "G729"},
{{1, AST_FORMAT_G729A}, "audio", "G729A"},
+ {{1, AST_FORMAT_G729A}, "audio", "G.729"},
{{1, AST_FORMAT_SPEEX}, "audio", "speex"},
{{1, AST_FORMAT_ILBC}, "audio", "iLBC"},
{{1, AST_FORMAT_G722}, "audio", "G722"},