diff --git a/ChangeLog b/ChangeLog
index 3322ed7023..24180cc43c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-04-22  Benjamin Otte  <otte@gnome.org>
+
+	* gst-libs/gst/riff/riff-media.c:
+	(gst_riff_create_video_caps_with_data):
+	  mpegversion is an int
+	* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_base_init):
+	  don't try to create pad templates with NULL caps, use any caps
+	  instead.
+
 2004-04-20  David Schleef  <ds@schleef.org>
 
 	* ext/sdl/Makefile.am: Link against libgstinterfaces, not
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index ad34dc7df6..1672373820 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -91,7 +91,7 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc,
     case GST_MAKE_FOURCC ('M', 'P', 'G', 'I'):
       caps = gst_caps_new_simple ("video/mpeg",
           "systemstream", G_TYPE_BOOLEAN, FALSE,
-          "mpegversion", G_TYPE_BOOLEAN, 1, NULL);
+          "mpegversion", G_TYPE_INT, 1, NULL);
       if (codec_name)
         *codec_name = g_strdup ("MPEG video");
       break;
diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c
index 4406f34525..2bd6d95d48 100644
--- a/sys/v4l/gstv4lsrc.c
+++ b/sys/v4l/gstv4lsrc.c
@@ -132,7 +132,7 @@ gst_v4lsrc_base_init (gpointer g_class)
   gst_element_class_set_details (gstelement_class, &gst_v4lsrc_details);
 
   src_template = gst_pad_template_new ("src",
-      GST_PAD_SRC, GST_PAD_ALWAYS, NULL);
+      GST_PAD_SRC, GST_PAD_ALWAYS, gst_caps_new_any ());
 
   gst_element_class_add_pad_template (gstelement_class, src_template);
 }