From: Joshua Colp Date: Mon, 10 Dec 2007 16:37:35 +0000 (+0000) Subject: Merged revisions 92204 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~468 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a7064d3fcfe399f13b9e70ea01a06a4688b5958;p=thirdparty%2Fasterisk.git Merged revisions 92204 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r92204 | file | 2007-12-10 12:36:15 -0400 (Mon, 10 Dec 2007) | 6 lines Add G729A as another possible payload name for G729. Some devices use this instead of G729, which is perfectly normal since the payload number itself is defined and can't be used by anything else so the name doesn't matter that much. (closes issue #11483) Reported by: revolution Patches: rtp.diff uploaded by revolution (license 346) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92205 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/rtp.c b/main/rtp.c index 4bc9842f79..fcc80df0e0 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -1626,6 +1626,7 @@ static struct { {{1, AST_FORMAT_SLINEAR}, "audio", "L16"}, {{1, AST_FORMAT_LPC10}, "audio", "LPC"}, {{1, AST_FORMAT_G729A}, "audio", "G729"}, + {{1, AST_FORMAT_G729A}, "audio", "G729A"}, {{1, AST_FORMAT_SPEEX}, "audio", "speex"}, {{1, AST_FORMAT_ILBC}, "audio", "iLBC"}, {{1, AST_FORMAT_G722}, "audio", "G722"},