Index: asterisk/include/asterisk/frame.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/frame.h,v
retrieving revision 1.42
diff -u -r1.42 frame.h
--- asterisk/include/asterisk/frame.h	21 Jan 2005 07:06:25 -0000	1.42
+++ asterisk/include/asterisk/frame.h	5 Mar 2005 17:03:17 -0000
@@ -192,6 +192,8 @@
 #define AST_FORMAT_H261		(1 << 18)
 /*! H.263 Video */
 #define AST_FORMAT_H263		(1 << 19)
+/*! H.263+ Video */
+#define AST_FORMAT_H263_PLUS    (1 << 20)
 /*! Max one */
 #define AST_FORMAT_MAX_VIDEO	(1 << 24)
 
Index: asterisk/frame.c
===================================================================
RCS file: /usr/cvsroot/asterisk/frame.c,v
retrieving revision 1.46
diff -u -r1.46 frame.c
--- asterisk/frame.c	28 Feb 2005 06:06:42 -0000	1.46
+++ asterisk/frame.c	5 Mar 2005 17:03:23 -0000
@@ -420,7 +420,7 @@
 	{ 1, AST_FORMAT_PNG, "png", "PNG image"},
 	{ 1, AST_FORMAT_H261, "h261", "H.261 Video" },
 	{ 1, AST_FORMAT_H263, "h263", "H.263 Video" },
-	{ 0, 0, "nothing", "undefined" },
+	{ 1, AST_FORMAT_H263_PLUS, "h263+", "H.263+ Video" },
 	{ 0, 0, "nothing", "undefined" },
 	{ 0, 0, "nothing", "undefined" },
 	{ 0, 0, "nothing", "undefined" },
@@ -559,7 +559,7 @@
 
 	if ((argc == 2) || (!strcasecmp(argv[1],"video"))) {
 		found = 1;
-		for (i=18;i<20;i++) {
+		for (i=18;i<21;i++) {
 			snprintf(hex,25,"(0x%x)",1<<i);
 			ast_cli(fd, "%11u (1 << %2d) %10s  video   %5s   (%s)\n",1 << i,i,hex,ast_getformatname(1<<i),ast_codec2str(1<<i));
 		}
Index: asterisk/rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.112
diff -u -r1.112 rtp.c
--- asterisk/rtp.c	4 Mar 2005 06:47:23 -0000	1.112
+++ asterisk/rtp.c	5 Mar 2005 17:03:35 -0000
@@ -666,6 +666,7 @@
   {{1, AST_FORMAT_PNG}, "video", "PNG"},
   {{1, AST_FORMAT_H261}, "video", "H261"},
   {{1, AST_FORMAT_H263}, "video", "H263"},
+  {{1, AST_FORMAT_H263_PLUS}, "video", "h263-1998"},
 };
 
 /* Static (i.e., well-known) RTP payload types for our "AST_FORMAT..."s:
@@ -690,6 +691,7 @@
   [26] = {1, AST_FORMAT_JPEG},
   [31] = {1, AST_FORMAT_H261},
   [34] = {1, AST_FORMAT_H263},
+  [103] = {1, AST_FORMAT_H263_PLUS},
   [97] = {1, AST_FORMAT_ILBC},
   [101] = {0, AST_RTP_DTMF},
   [110] = {1, AST_FORMAT_SPEEX},
@@ -1400,6 +1402,7 @@
 		/* fall through to... */
 	case AST_FORMAT_H261:
 	case AST_FORMAT_H263:
+	case AST_FORMAT_H263_PLUS:
 	case AST_FORMAT_G723_1:
 	case AST_FORMAT_LPC10:
 	case AST_FORMAT_SPEEX: