[svn-commits] file: trunk r47898 - in /trunk: ./ main/rtp.c

[svn-commits at lists.digium.com]

Author: file
Date: Tue Nov 21 11:34:22 2006
New Revision: 47898

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47898
Log:
Merged revisions 47897 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47897 | file | 2006-11-21 12:32:27 -0500 (Tue, 21 Nov 2006) | 2 lines

If we have the non standard G726-32 setting turned on we want to return G726-32 to the SDP, not our AAL2 string. (issue #8330 reported by voipgate)

........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=47898&r1=47897&r2=47898
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Tue Nov 21 11:34:22 2006
@@ -1705,7 +1705,7 @@
 			if (isAstFormat &&
 			    (code == AST_FORMAT_G726_AAL2) &&
 			    (options & AST_RTP_OPT_G726_NONSTANDARD))
-				return "AAL2-G726-32";
+				return "G726-32";
 			else
 				return mimeTypes[i].subtype;
 		}