diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-12-16 20:30:00 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-12-16 20:30:00 +0000 |
| commit | d8a9cb2933260dc71ca035b3d55a620aaf637d3e (patch) | |
| tree | 9fd4d35aaec83d9a36a76a805309f9dcbb702f4c | |
| parent | 4f6378f2372b7db7c46e1b2ecb2484a0dcac31fa (diff) | |
| download | gst-plugins-bad-d8a9cb2933260dc71ca035b3d55a620aaf637d3e.tar.gz gst-plugins-bad-d8a9cb2933260dc71ca035b3d55a620aaf637d3e.tar.bz2 gst-plugins-bad-d8a9cb2933260dc71ca035b3d55a620aaf637d3e.zip | |
gst-libs/gst/riff/riff-media.c: Add h264.
Original commit message from CVS:
* gst-libs/gst/riff/riff-media.c:
(gst_riff_create_video_caps_with_data),
(gst_riff_create_video_template_caps):
Add h264.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 8 |
2 files changed, 14 insertions, 1 deletions
@@ -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'), |