summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--gst-libs/gst/riff/riff-media.c10
2 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 828166a2..92120ada 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,15 @@
* 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 <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 DIB fourcc (raw, palettized 8-bit RGB).
* gst-libs/gst/riff/riff-read.c:
(gst_riff_read_strf_vids_with_data):
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
};