mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-libs/gst/riff/riff-media.c: MP4S is generic MPEG-4, not a microsoft variant.

Browse source 
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.
This commit is contained in:
Wim Taymans 2008-03-28 16:22:35 +00:00
parent 670d6cd1e4
commit 9ac953ef0f
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-03-28 Wim Taymans <wim.taymans@collabora.co.uk>
* 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 <msmith@fluendo.com> 2008-03-27 Michael Smith <msmith@fluendo.com>
* gst/gdp/gstgdpdepay.c: (gst_gdp_depay_chain): * gst/gdp/gstgdpdepay.c: (gst_gdp_depay_chain):

2
gst-libs/gst/riff/riff-media.c
View file

@ -304,7 +304,6 @@ gst_riff_create_video_caps (guint32 codec_fcc,
break; break;
case GST_MAKE_FOURCC ('M', 'P', 'G', '4'): case GST_MAKE_FOURCC ('M', 'P', 'G', '4'):
case GST_MAKE_FOURCC ('M', 'P', '4', 'S'):
caps = gst_caps_new_simple ("video/x-msmpeg", caps = gst_caps_new_simple ("video/x-msmpeg",
"msmpegversion", G_TYPE_INT, 41, NULL); "msmpegversion", G_TYPE_INT, 41, NULL);
if (codec_name) if (codec_name)
@ -327,6 +326,7 @@ gst_riff_create_video_caps (guint32 codec_fcc,
*codec_name = g_strdup ("Microsoft MPEG-4 4.3"); *codec_name = g_strdup ("Microsoft MPEG-4 4.3");
break; break;
case GST_MAKE_FOURCC ('M', 'P', '4', 'S'):
case GST_MAKE_FOURCC ('M', '4', 'S', '2'): case GST_MAKE_FOURCC ('M', '4', 'S', '2'):
caps = gst_caps_new_simple ("video/mpeg", caps = gst_caps_new_simple ("video/mpeg",
"mpegversion", G_TYPE_INT, 4, NULL); "mpegversion", G_TYPE_INT, 4, NULL);