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)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47898 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/rtp.c

@@ -1705,7 +1705,7 @@ const char *ast_rtp_lookup_mime_subtype(const int isAstFormat, const int code,
 			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;
 		}