Index: main/rtp.c
===================================================================
--- main/rtp.c	(revision 222309)
+++ main/rtp.c	(working copy)
@@ -2281,10 +2281,14 @@
 		    strcasecmp(mimeType, mimeTypes[i].type) == 0) {
 			found = 1;
 			rtp->current_RTP_PT[pt] = mimeTypes[i].payloadType;
-			if ((mimeTypes[i].payloadType.code == AST_FORMAT_G726) &&
-			    mimeTypes[i].payloadType.isAstFormat &&
-			    (options & AST_RTP_OPT_G726_NONSTANDARD))
-				rtp->current_RTP_PT[pt].code = AST_FORMAT_G726_AAL2;
+			if (mimeTypes[i].payloadType.isAstFormat &&
+			    (options & AST_RTP_OPT_G726_NONSTANDARD)) {
+				if (mimeTypes[i].payloadType.code == AST_FORMAT_G726) {
+					rtp->current_RTP_PT[pt].code = AST_FORMAT_G726_AAL2;
+				} else if (mimeTypes[i].payloadType.code == AST_FORMAT_G726__AAL2) {
+					rtp->current_RTP_PT[pt].code = AST_FORMAT_G726;
+				}
+			}
 			break;
 		}
 	}
@@ -2386,11 +2390,14 @@
 	for (i = 0; i < ARRAY_LEN(mimeTypes); ++i) {
 		if ((mimeTypes[i].payloadType.code == code) && (mimeTypes[i].payloadType.isAstFormat == isAstFormat)) {
 			if (isAstFormat &&
-			    (code == AST_FORMAT_G726_AAL2) &&
-			    (options & AST_RTP_OPT_G726_NONSTANDARD))
-				return "G726-32";
-			else
-				return mimeTypes[i].subtype;
+			    (options & AST_RTP_OPT_G726_NONSTANDARD)) {
+				if (code == AST_FORMAT_G726_AAL2) {
+					return "G726-32";
+				} else if (code == AST_FORMAT_G726) {
+					return "AAL2-G726-32";
+				}
+			}
+			return mimeTypes[i].subtype;
 		}
 	}