summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2008-01-16 15:04:08 +0000
committerJoshua Colp <jcolp@digium.com>2008-01-16 15:04:08 +0000
commit2ee416a55a865e2253d39ddba840e2bbfcded8a6 (patch)
tree05a3db95d5d93084b9f4de53f11e2423d583f398 /main
parent4082bed03a1334e7f08889150d1d14137c072e3f (diff)
Merged revisions 98958 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r98958 | file | 2008-01-16 11:03:14 -0400 (Wed, 16 Jan 2008) | 4 lines Add two more SDP names for ulaw and alaw. (closes issue #11777) Reported by: tootai ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98959 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/rtp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/rtp.c b/main/rtp.c
index 0794fbcde..874f8ddb2 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -1624,7 +1624,9 @@ static struct {
{{1, AST_FORMAT_G723_1}, "audio", "G723"},
{{1, AST_FORMAT_GSM}, "audio", "GSM"},
{{1, AST_FORMAT_ULAW}, "audio", "PCMU"},
+ {{1, AST_FORMAT_ULAW}, "audio", "G711U"},
{{1, AST_FORMAT_ALAW}, "audio", "PCMA"},
+ {{1, AST_FORMAT_ALAW}, "audio", "G711A"},
{{1, AST_FORMAT_G726}, "audio", "G726-32"},
{{1, AST_FORMAT_ADPCM}, "audio", "DVI4"},
{{1, AST_FORMAT_SLINEAR}, "audio", "L16"},