diff --git a/ChangeLog b/ChangeLog
index e22b890e22..3546af549c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-14  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* gst/mpeg4videoparse/mpeg4videoparse.c: (gst_mpeg4vparse_init):
+	Set fixed caps on the srcpad after we created the pad...
+
 2008-05-14  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
 	* tests/check/Makefile.am:
diff --git a/common b/common
index d78efae300..0823ac6b46 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit d78efae300d4dff0291717ccf7a2b82c713a81ef
+Subproject commit 0823ac6b46b7332109bbc5f1ef40e24e648fae51
diff --git a/gst/mpeg4videoparse/mpeg4videoparse.c b/gst/mpeg4videoparse/mpeg4videoparse.c
index e845ec88b3..fc43f0149b 100644
--- a/gst/mpeg4videoparse/mpeg4videoparse.c
+++ b/gst/mpeg4videoparse/mpeg4videoparse.c
@@ -798,12 +798,12 @@ gst_mpeg4vparse_init (GstMpeg4VParse * parse, GstMpeg4VParseClass * g_class)
       GST_DEBUG_FUNCPTR (gst_mpeg4vparse_sink_event));
   gst_pad_set_setcaps_function (parse->sinkpad,
       GST_DEBUG_FUNCPTR (gst_mpeg4vparse_sink_setcaps));
-  gst_pad_use_fixed_caps (parse->srcpad);
   gst_element_add_pad (GST_ELEMENT (parse), parse->sinkpad);
 
   parse->srcpad = gst_pad_new_from_static_template (&src_template, "src");
   gst_pad_set_query_function (parse->srcpad,
       GST_DEBUG_FUNCPTR (gst_mpeg4vparse_src_query));
+  gst_pad_use_fixed_caps (parse->srcpad);
   gst_element_add_pad (GST_ELEMENT (parse), parse->srcpad);
 
   parse->adapter = gst_adapter_new ();