[asterisk-commits] mmichelson: branch 1.6.1 r143349 - in /branches/1.6.1: ./ main/rtp.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Sep 17 13:30:24 2008
New Revision: 143349

URL: http://svn.digium.com/view/asterisk?view=rev&rev=143349
Log:
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.


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/rtp.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/rtp.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/rtp.c?view=diff&rev=143349&r1=143348&r2=143349
==============================================================================
--- branches/1.6.1/main/rtp.c (original)
+++ branches/1.6.1/main/rtp.c Wed Sep 17 13:30:24 2008
@@ -1865,6 +1865,7 @@
 	{{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"},