diff --git a/ChangeLog b/ChangeLog
index c109980114..d7dba84262 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-10  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	Based on patch by: <mutex at runbox dot com>
+
+	* gst/videoparse/gstvideoparse.c: (gst_video_parse_src_query):
+	Forward the query upstream, the default element event handler does
+	something different. Fixes #502879.
+
 2007-12-10  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst/rtpmanager/gstrtpbin.c: (on_ssrc_sdes), (create_session),
diff --git a/gst/videoparse/gstvideoparse.c b/gst/videoparse/gstvideoparse.c
index 983784439d..bc084cad00 100644
--- a/gst/videoparse/gstvideoparse.c
+++ b/gst/videoparse/gstvideoparse.c
@@ -355,17 +355,14 @@ gst_video_parse_src_query (GstPad * pad, GstQuery * query)
 
     gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
   } else {
-    ret = GST_ELEMENT_CLASS (parent_class)->query (GST_ELEMENT (vp), query);
+    /* else forward upstream */
+    ret = gst_pad_peer_query (vp->sinkpad, query);
   }
 
   gst_object_unref (vp);
   return ret;
 }
 
-
-
-
-
 static gboolean
 plugin_init (GstPlugin * plugin)
 {