summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gst-libs/gst/riff/riff-media.c8
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 85efe34e..5d093f87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-12-16 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * gst-libs/gst/riff/riff-media.c:
+ (gst_riff_create_video_caps_with_data),
+ (gst_riff_create_video_template_caps):
+ Add h264.
+
+2004-12-16 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
* gst-libs/gst/audio/Makefile.am:
Try to fix buildbot.
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 4ff43396..e46d4f6e 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -160,6 +160,12 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc,
*codec_name = g_strdup ("Xirlink H.263");
break;
+ case GST_MAKE_FOURCC ('h', '2', '6', '4'):
+ caps = gst_caps_new_simple ("video/x-h264", NULL);
+ if (codec_name)
+ *codec_name = g_strdup ("ITU H.264");
+ break;
+
case GST_MAKE_FOURCC ('V', 'S', 'S', 'H'):
caps = gst_caps_new_simple ("video/x-h264", NULL);
if (codec_name)
@@ -589,7 +595,7 @@ gst_riff_create_video_template_caps (void)
GST_MAKE_FOURCC ('D', 'I', 'V', '3'),
GST_MAKE_FOURCC ('M', 'P', 'E', 'G'),
GST_MAKE_FOURCC ('H', '2', '6', '3'),
- GST_MAKE_FOURCC ('V', 'S', 'S', 'H'),
+ GST_MAKE_FOURCC ('h', '2', '6', '4'),
GST_MAKE_FOURCC ('D', 'I', 'V', 'X'),
GST_MAKE_FOURCC ('D', 'X', '5', '0'),
GST_MAKE_FOURCC ('X', 'V', 'I', 'D'),