summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--gst-libs/gst/riff/riff-media.c2
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 021e9e60..233268cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-07-15 Ronald Bultje <rbultje@ronald.bitfreak.net>
+
+ * 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 <otte@gnome.org>
* 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 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);