diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-06-09 09:47:22 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-06-09 09:47:22 +0000 |
| commit | 8153a91c9e0673aed62b6da62382a59f86b82af5 (patch) | |
| tree | bd7c9d1cd2a0236ab6306ebed78d3936c8c92c8c | |
| parent | ca6124bd761bc2adc685942a22f51f304b616c76 (diff) | |
| download | gst-plugins-bad-8153a91c9e0673aed62b6da62382a59f86b82af5.tar.gz gst-plugins-bad-8153a91c9e0673aed62b6da62382a59f86b82af5.tar.bz2 gst-plugins-bad-8153a91c9e0673aed62b6da62382a59f86b82af5.zip | |
gst-libs/gst/riff/riff-media.c: Add Microsoft ISO MPEG-4 1.1 (M4S2; #306659).
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 Microsoft ISO MPEG-4 1.1 (M4S2; #306659).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 8 |
2 files changed, 15 insertions, 0 deletions
@@ -1,5 +1,12 @@ 2005-06-09 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 Microsoft ISO MPEG-4 1.1 (M4S2; #306659). + +2005-06-09 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak), (qtdemux_video_caps): Fix up SVQ3 caps (to fix frame order problems; #306530). diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 0f92a40a..9b754534 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -250,6 +250,13 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc, *codec_name = g_strdup ("Microsoft MPEG-4 4.3"); break; + case GST_MAKE_FOURCC ('M', '4', 'S', '2'): + caps = gst_caps_new_simple ("video/mpeg", + "mpegversion", G_TYPE_INT, 4, NULL); + if (codec_name) + *codec_name = g_strdup ("Microsoft ISO MPEG-4 1.1"); + break; + case GST_MAKE_FOURCC ('3', 'I', 'V', '1'): case GST_MAKE_FOURCC ('3', 'I', 'V', '2'): caps = gst_caps_new_simple ("video/x-3ivx", NULL); @@ -644,6 +651,7 @@ gst_riff_create_video_template_caps (void) GST_MAKE_FOURCC ('D', 'I', 'B', ' '), GST_MAKE_FOURCC ('X', 'x', 'a', 'n'), GST_MAKE_FOURCC ('I', 'V', '5', '0'), + GST_MAKE_FOURCC ('M', '4', 'S', '2'), /* FILL ME */ 0 }; |