summaryrefslogtreecommitdiffstats
path: root/gst-libs
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-10-02 20:27:03 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-10-02 20:27:03 +0000
commit36979491f1f52d44ad7ad3b2275703744b5c11c6 (patch)
treef50ed083ea78b5229e18a256d289ae9b5434709c /gst-libs
parentda9c8309164aeeb9782e0c4640b18fc39f4b09f7 (diff)
downloadgst-plugins-bad-36979491f1f52d44ad7ad3b2275703744b5c11c6.tar.gz
gst-plugins-bad-36979491f1f52d44ad7ad3b2275703744b5c11c6.tar.bz2
gst-plugins-bad-36979491f1f52d44ad7ad3b2275703744b5c11c6.zip
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.
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/riff/riff-media.c10
1 files changed, 9 insertions, 1 deletions
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
};