From 970c587823b9e5ec5c2e931865f6ebcbd0ed2650 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 11 Apr 2004 21:36:45 +0000 Subject: [PATCH] gst-libs/gst/riff/riff-media.c: Add MS video v1. Original commit message from CVS: * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps), (gst_riff_create_video_template_caps): Add MS video v1. * gst/avi/gstavidemux.c: (gst_avi_demux_stream_index), (gst_avi_demux_stream_data): Add support for "rec-list" chunks. --- ChangeLog | 9 +++++++++ gst-libs/gst/riff/riff-media.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/ChangeLog b/ChangeLog index a841e7c..a7260b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2004-04-11 Ronald Bultje + * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps), + (gst_riff_create_video_template_caps): + Add MS video v1. + * gst/avi/gstavidemux.c: (gst_avi_demux_stream_index), + (gst_avi_demux_stream_data): + Add support for "rec-list" chunks. + +2004-04-11 Ronald Bultje + * gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps): Fix another codecname mismatch. diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 683ec62..1d4c6db 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -208,6 +208,18 @@ gst_riff_create_video_caps (guint32 codec_fcc, *codec_name = g_strdup ("Cinepak video"); break; + case GST_MAKE_FOURCC ('M', 'S', 'V', 'C'): + case GST_MAKE_FOURCC ('m', 's', 'v', 'c'): + case GST_MAKE_FOURCC ('C', 'R', 'A', 'M'): + case GST_MAKE_FOURCC ('c', 'r', 'a', 'm'): + case GST_MAKE_FOURCC ('W', 'H', 'A', 'M'): + case GST_MAKE_FOURCC ('w', 'h', 'a', 'm'): + caps = gst_caps_new_simple ("video/x-msvideocodec", + "msvideoversion", G_TYPE_INT, 1, NULL); + if (codec_name) + *codec_name = g_strdup ("MS video v1"); + break; + default: GST_WARNING ("Unkown video fourcc " GST_FOURCC_FORMAT, GST_FOURCC_ARGS (codec_fcc)); @@ -380,6 +392,8 @@ gst_riff_create_video_template_caps (void) GST_MAKE_FOURCC ('D', 'I', 'V', 'X'), GST_MAKE_FOURCC ('X', 'V', 'I', 'D'), GST_MAKE_FOURCC ('3', 'I', 'V', '1'), + GST_MAKE_FOURCC ('c', 'v', 'i', 'd'), + GST_MAKE_FOURCC ('m', 's', 'v', 'c'), /* FILL ME */ 0 }; -- 2.7.4