diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-10-02 20:27:03 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-10-02 20:27:03 +0000 |
| commit | 36979491f1f52d44ad7ad3b2275703744b5c11c6 (patch) | |
| tree | f50ed083ea78b5229e18a256d289ae9b5434709c | |
| parent | da9c8309164aeeb9782e0c4640b18fc39f4b09f7 (diff) | |
| download | gst-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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 10 |
2 files changed, 18 insertions, 1 deletions
@@ -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 }; |