From 4bd27986d35729524d2a92d4f444ac914bdccb9a Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 15 Jul 2004 23:56:05 +0000 Subject: [PATCH] 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. --- ChangeLog | 13 +++++++++++++ gst-libs/gst/riff/riff-media.c | 2 ++ gst/typefind/gsttypefindfunctions.c | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 021e9e6070..233268cb4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2004-07-15 Ronald Bultje + + * 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. + 2004-07-15 Benjamin Otte * sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls), diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 313c959419..de2a98389d 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); diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c index 64f2205d99..32d6aac5c2 100644 --- a/gst/typefind/gsttypefindfunctions.c +++ b/gst/typefind/gsttypefindfunctions.c @@ -1320,7 +1320,7 @@ plugin_init (GstPlugin * plugin) au_exts, ".snd", 4, GST_TYPE_FIND_MAXIMUM); TYPE_FIND_REGISTER_RIFF (plugin, "video/x-msvideo", GST_RANK_PRIMARY, avi_exts, "AVI "); - TYPE_FIND_REGISTER_RIFF (plugin, "video/x-cdxa", GST_RANK_SECONDARY, + TYPE_FIND_REGISTER_RIFF (plugin, "video/x-cdxa", GST_RANK_PRIMARY, cdxa_exts, "CDXA"); TYPE_FIND_REGISTER_START_WITH (plugin, "audio/x-flac", GST_RANK_PRIMARY, flac_exts, "fLaC", 4, GST_TYPE_FIND_MAXIMUM);