Index: main/rtp.c
===================================================================
--- main/rtp.c	(revision 228826)
+++ main/rtp.c	(working copy)
@@ -1880,6 +1880,8 @@
 		rtp->f.samples = ast_codec_get_samples(&rtp->f);
 		if (rtp->f.subclass == AST_FORMAT_SLINEAR) 
 			ast_frame_byteswap_be(&rtp->f);
+		if (rtp->f.subclass == AST_FORMAT_SLINEAR16)
+		        ast_frame_byteswap_be(&rtp->f);
 		calc_rxstamp(&rtp->f.delivery, rtp, timestamp, mark);
 		/* Add timing data to let ast_generic_bridge() put the frame into a jitterbuf */
 		ast_set_flag(&rtp->f, AST_FRFLAG_HAS_TIMING_INFO);
@@ -1930,6 +1932,7 @@
 	{{1, AST_FORMAT_G726}, "audio", "G726-32", 8000},
 	{{1, AST_FORMAT_ADPCM}, "audio", "DVI4", 8000},
 	{{1, AST_FORMAT_SLINEAR}, "audio", "L16", 8000},
+	{{1, AST_FORMAT_SLINEAR16}, "audio", "L16", 16000},
 	{{1, AST_FORMAT_LPC10}, "audio", "LPC", 8000},
 	{{1, AST_FORMAT_G729A}, "audio", "G729", 8000},
 	{{1, AST_FORMAT_G729A}, "audio", "G729A", 8000},
Index: main/frame.c
===================================================================
--- main/frame.c	(revision 228826)
+++ main/frame.c	(working copy)
@@ -686,7 +686,7 @@
 	ast_cli(a->fd, "--------------------------------------------------------------------------------\n");
 	if ((a->argc == 3) || (!strcasecmp(a->argv[3],"audio"))) {
 		found = 1;
-		for (i=0;i<13;i++) {
+		for (i=0;i<16;i++) {
 			snprintf(hex,25,"(0x%x)",1<<i);
 			ast_cli(a->fd, "%11u (1 << %2d) %10s  audio   %8s   (%s)\n",1 << i,i,hex,ast_getformatname(1<<i),ast_codec2str(1<<i));
 		}