From 9ac953ef0f0d92fa6b0852417e24df0611487acd Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 28 Mar 2008 16:22:35 +0000 Subject: [PATCH] gst-libs/gst/riff/riff-media.c: MP4S is generic MPEG-4, not a microsoft variant. Original commit message from CVS: * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps): MP4S is generic MPEG-4, not a microsoft variant. --- ChangeLog | 5 +++++ gst-libs/gst/riff/riff-media.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a75ef9644a..6bcfaf4503 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-28 Wim Taymans + + * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps): + MP4S is generic MPEG-4, not a microsoft variant. + 2008-03-27 Michael Smith * gst/gdp/gstgdpdepay.c: (gst_gdp_depay_chain): diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index b999799abe..28727d7591 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -304,7 +304,6 @@ gst_riff_create_video_caps (guint32 codec_fcc, break; case GST_MAKE_FOURCC ('M', 'P', 'G', '4'): - case GST_MAKE_FOURCC ('M', 'P', '4', 'S'): caps = gst_caps_new_simple ("video/x-msmpeg", "msmpegversion", G_TYPE_INT, 41, NULL); if (codec_name) @@ -327,6 +326,7 @@ gst_riff_create_video_caps (guint32 codec_fcc, *codec_name = g_strdup ("Microsoft MPEG-4 4.3"); break; + case GST_MAKE_FOURCC ('M', 'P', '4', 'S'): case GST_MAKE_FOURCC ('M', '4', 'S', '2'): caps = gst_caps_new_simple ("video/mpeg", "mpegversion", G_TYPE_INT, 4, NULL);