diff --git a/ChangeLog b/ChangeLog
index 1ac54ba9c0..2b89000372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-10  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* gst-libs/gst/video/gstvideosink.c: (gst_video_sink_init):
+	Disable max-lateness by setting it to -1 for now, so that 
+	we can bed QoS stuff in thoroughly between now and the next
+	release.
+
 2006-03-10  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps):
diff --git a/gst-libs/gst/video/gstvideosink.c b/gst-libs/gst/video/gstvideosink.c
index c427497830..7ce289faf8 100644
--- a/gst-libs/gst/video/gstvideosink.c
+++ b/gst-libs/gst/video/gstvideosink.c
@@ -104,7 +104,7 @@ gst_video_sink_init (GstVideoSink * videosink)
   videosink->width = 0;
   videosink->height = 0;
 
-  gst_base_sink_set_max_lateness (GST_BASE_SINK (videosink), 20 * GST_MSECOND);
+  gst_base_sink_set_max_lateness (GST_BASE_SINK (videosink), -1);
 }
 
 static void