From 36979491f1f52d44ad7ad3b2275703744b5c11c6 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 2 Oct 2004 20:27:03 +0000 Subject: gst-libs/gst/riff/riff-media.c: Add wing commander format mimetype/fourccs. 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 wing commander format mimetype/fourccs. * gst/avi/gstavidemux.c: (gst_avi_demux_massage_index): Don't crash if some value is 0. --- ChangeLog | 9 +++++++++ gst-libs/gst/riff/riff-media.c | 10 +++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 828166a2..92120ada 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-10-02 Ronald S. Bultje + + * gst-libs/gst/riff/riff-media.c: + (gst_riff_create_video_caps_with_data), + (gst_riff_create_video_template_caps): + Add wing commander format mimetype/fourccs. + * gst/avi/gstavidemux.c: (gst_avi_demux_massage_index): + Don't crash if some value is 0. + 2004-10-02 Ronald S. Bultje * gst-libs/gst/riff/riff-media.c: diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 7e6c4dbc..324fdeef 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -287,7 +287,14 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc, gst_caps_set_simple (caps, "depth", GST_TYPE_INT_RANGE, 1, 64, NULL); } if (codec_name) - *codec_name = g_strdup ("Mcrosoft RLE"); + *codec_name = g_strdup ("Microsoft RLE"); + break; + + case GST_MAKE_FOURCC ('X', 'x', 'a', 'n'): + caps = gst_caps_new_simple ("video/x-xan", + "wcversion", G_TYPE_INT, 4, NULL); + if (codec_name) + *codec_name = g_strdup ("Xan Wing Commander 4"); break; default: @@ -567,6 +574,7 @@ gst_riff_create_video_template_caps (void) GST_MAKE_FOURCC ('m', 's', 'v', 'c'), GST_MAKE_FOURCC ('R', 'L', 'E', ' '), GST_MAKE_FOURCC ('D', 'I', 'B', ' '), + GST_MAKE_FOURCC ('X', 'x', 'a', 'n'), /* FILL ME */ 0 }; -- cgit v1.2.1