diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-17 18:30:24 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-17 18:30:24 +0000 |
| commit | 3d83b1354b2caa520ba7519b94e2d1cb3b70c15d (patch) | |
| tree | d48720f4060217da1257d7d3c2637bc56977d867 | |
| parent | b62a59d911fa9afc4bdbdfc83ccdf4aa67fd9a08 (diff) | |
Merged revisions 143340 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r143340 | mmichelson | 2008-09-17 13:26:35 -0500 (Wed, 17 Sep 2008) | 14 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@143349 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/rtp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/rtp.c b/main/rtp.c index b4d7734d1..aa8cb7818 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"}, |