--- frame.c	2007-04-03 19:33:46.000000000 +0200
+++ frame.c.mod	2007-04-03 19:34:16.000000000 +0200
@@ -100,7 +100,7 @@
 	{ 1, AST_FORMAT_H261, "h261", "H.261 Video" },	/*!< Passthrough */
 	{ 1, AST_FORMAT_H263, "h263", "H.263 Video" },	/*!< Passthrough support, see format_h263.c */
 	{ 1, AST_FORMAT_H263_PLUS, "h263p", "H.263+ Video" },	/*!< See format_h263.c */
-	{ 0, 0, "nothing", "undefined" },
+	{ 1, AST_FORMAT_H264, "h264", "H.264 Video" },	
 	{ 0, 0, "nothing", "undefined" },
 	{ 0, 0, "nothing", "undefined" },
 	{ 0, 0, "nothing", "undefined" },
@@ -630,7 +630,7 @@
 
 	if ((argc == 2) || (!strcasecmp(argv[1],"video"))) {
 		found = 1;
-		for (i=18;i<21;i++) {
+		for (i=18;i<22;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));
 		}
--- include/asterisk/frame.h	2007-04-03 17:54:52.000000000 +0200
+++ include/asterisk/frame.h.mod	2007-04-03 12:28:45.000000000 +0200
@@ -203,6 +203,8 @@
 #define AST_FORMAT_H263		(1 << 19)
 /*! H.263+ Video */
 #define AST_FORMAT_H263_PLUS	(1 << 20)
+/*! H.264 Video */
+#define AST_FORMAT_H264    	(1 << 21)
 /*! Maximum video format */
 #define AST_FORMAT_MAX_VIDEO	(1 << 24)
 
--- rtp.c	2007-04-03 17:54:08.000000000 +0200
+++ rtp.c.mod	2007-04-03 12:54:29.000000000 +0200
@@ -671,6 +671,7 @@
   {{1, AST_FORMAT_H261}, "video", "H261"},
   {{1, AST_FORMAT_H263}, "video", "H263"},
   {{1, AST_FORMAT_H263_PLUS}, "video", "h263-1998"},
+  {{1, AST_FORMAT_H264}, "video", "H264"},
 };
 
 /* Static (i.e., well-known) RTP payload types for our "AST_FORMAT..."s:
@@ -699,6 +700,7 @@
   [34] = {1, AST_FORMAT_H263},
   [103] = {1, AST_FORMAT_H263_PLUS},
   [97] = {1, AST_FORMAT_ILBC},
+  [99] = {1, AST_FORMAT_H264},
   [101] = {0, AST_RTP_DTMF},
   [110] = {1, AST_FORMAT_SPEEX},
   [111] = {1, AST_FORMAT_G726},
@@ -1453,6 +1455,7 @@
 	case AST_FORMAT_H261:
 	case AST_FORMAT_H263:
 	case AST_FORMAT_H263_PLUS:
+	case AST_FORMAT_H264:
 	case AST_FORMAT_G723_1:
 	case AST_FORMAT_LPC10:
 	case AST_FORMAT_SPEEX:
--- formats/Makefile	2007-04-03 19:44:31.000000000 +0200
+++ formats/Makefile.mod	2007-04-03 11:28:49.000000000 +0200
@@ -13,7 +13,7 @@
 
 FORMAT_LIBS=format_gsm.so format_wav.so \
 	format_wav_gsm.so format_vox.so format_pcm.so format_g729.so \
-	format_pcm_alaw.so format_h263.so format_g726.so format_ilbc.so \
+	format_pcm_alaw.so format_h263.so format_h264.so format_g726.so format_ilbc.so \
 	format_sln.so format_au.so
 FORMAT_LIBS+=format_jpeg.so