diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-07-15 23:56:04 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-07-15 23:56:04 +0000 |
| commit | 931758cb249414856515bd693fd52412d4d56f27 (patch) | |
| tree | b9a93a303074f4e6a8d15766b96a9854703a30bc /gst-libs/gst | |
| parent | 55965ea86fe66c840201f436102fe2bb3efd790a (diff) | |
| download | gst-plugins-bad-931758cb249414856515bd693fd52412d4d56f27.tar.gz gst-plugins-bad-931758cb249414856515bd693fd52412d4d56f27.tar.bz2 gst-plugins-bad-931758cb249414856515bd693fd52412d4d56f27.zip | |
gst-libs/gst/riff/riff-media.c: mp42/mp43 (no caps) exist too.
Original commit message from CVS:
* gst-libs/gst/riff/riff-media.c:
(gst_riff_create_video_caps_with_data):
mp42/mp43 (no caps) exist too.
* gst/matroska/matroska-demux.c: (gst_matroska_demux_video_caps):
Set pixel_width/height; we've got them in-caps.
* gst/typefind/gsttypefindfunctions.c: (plugin_init):
* gst/wavparse/gstwavparse.c: (plugin_init):
Both are valid primary.
* sys/oss/gstossmixer.c:
Remove i18n hack and enable translations.
Diffstat (limited to 'gst-libs/gst')
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 313c9594..de2a9838 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -191,6 +191,7 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc, *codec_name = g_strdup ("Microsoft MPEG-4 4.1"); break; + case GST_MAKE_FOURCC ('m', 'p', '4', '2'): case GST_MAKE_FOURCC ('M', 'P', '4', '2'): caps = gst_caps_new_simple ("video/x-msmpeg", "msmpegversion", G_TYPE_INT, 42, NULL); @@ -198,6 +199,7 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc, *codec_name = g_strdup ("Microsoft MPEG-4 4.2"); break; + case GST_MAKE_FOURCC ('m', 'p', '4', '3'): case GST_MAKE_FOURCC ('M', 'P', '4', '3'): caps = gst_caps_new_simple ("video/x-msmpeg", "msmpegversion", G_TYPE_INT, 43, NULL); |