diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-01-19 12:47:20 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-01-19 12:47:20 +0000 |
| commit | 0419fe8a8816b087d0d703ff0c71405a5da86424 (patch) | |
| tree | e2a5a9784dd1a72001f1d6aae4aabb2fef29cb32 | |
| parent | 8907fa5c132d21660da187566757c025ea2b789d (diff) | |
| download | gst-plugins-bad-0419fe8a8816b087d0d703ff0c71405a5da86424.tar.gz gst-plugins-bad-0419fe8a8816b087d0d703ff0c71405a5da86424.tar.bz2 gst-plugins-bad-0419fe8a8816b087d0d703ff0c71405a5da86424.zip | |
gst-libs/gst/riff/riff-media.c: Add intel-h263.
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 intel-h263.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 8 |
2 files changed, 15 insertions, 0 deletions
@@ -1,5 +1,12 @@ 2005-01-19 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 intel-h263. + +2005-01-19 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * ext/mad/gstmad.c: (gst_mad_check_caps_reset), (gst_mad_chain): Fail if caps negotiation fails. Should fix #162184, and should definately be in there regardless of it fixing the actual bug. diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 4adb157b..350f11b6 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -160,6 +160,13 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc, *codec_name = g_strdup ("Xirlink H.263"); break; + /* apparently not standard H.263...? */ + case GST_MAKE_FOURCC ('I', '2', '6', '3'): + caps = gst_caps_new_simple ("video/x-intel-h263", NULL); + if (codec_name) + *codec_name = g_strdup ("Intel H.263"); + break; + case GST_MAKE_FOURCC ('h', '2', '6', '4'): caps = gst_caps_new_simple ("video/x-h264", NULL); if (codec_name) @@ -602,6 +609,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 ('I', '2', '6', '3'), GST_MAKE_FOURCC ('h', '2', '6', '4'), GST_MAKE_FOURCC ('D', 'I', 'V', 'X'), GST_MAKE_FOURCC ('D', 'X', '5', '0'), |