aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-21 17:34:22 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-21 17:34:22 +0000
commitf6bcd15af8147a05314b300cf7ba8daef22d0998 (patch)
tree559dbdcfc91c1ce9276ccc33a9d5bb4c68516d31
parent217a902c1cffff5a26667ead4d5f5d93982a998a (diff)
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: http://svn.digium.com/svn/asterisk/trunk@47898 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/rtp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/rtp.c b/main/rtp.c
index cbbc4a7ab..2edd2bb43 100644
--- a/main/rtp.c
+++ b/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;
}