diff --git a/ChangeLog b/ChangeLog
index 5d0bca7294..13b3a48aa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-17  Michael Smith <msmith@fluendo.com>
+
+	* gst/base/gstbasesink.c: (gst_base_sink_do_sync):
+	  Check if end time is valid using end time, not start time.
+
 2005-10-17  Stefan Kost  <ensonic@users.sf.net>
 
 	* check/gst-libs/controller.c: (GST_START_TEST),
diff --git a/gst/base/gstbasesink.c b/gst/base/gstbasesink.c
index e55fb3210e..41a49a26e4 100644
--- a/gst/base/gstbasesink.c
+++ b/gst/base/gstbasesink.c
@@ -988,7 +988,7 @@ gst_base_sink_do_sync (GstBaseSink * basesink, GstBuffer * buffer)
     bclass->get_times (basesink, buffer, &start, &end);
 
   start_valid = GST_CLOCK_TIME_IS_VALID (start);
-  end_valid = GST_CLOCK_TIME_IS_VALID (start);
+  end_valid = GST_CLOCK_TIME_IS_VALID (end);
 
   GST_DEBUG_OBJECT (basesink, "got times start: %" GST_TIME_FORMAT
       ", end: %" GST_TIME_FORMAT, GST_TIME_ARGS (start), GST_TIME_ARGS (end));
diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index e55fb3210e..41a49a26e4 100644
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -988,7 +988,7 @@ gst_base_sink_do_sync (GstBaseSink * basesink, GstBuffer * buffer)
     bclass->get_times (basesink, buffer, &start, &end);
 
   start_valid = GST_CLOCK_TIME_IS_VALID (start);
-  end_valid = GST_CLOCK_TIME_IS_VALID (start);
+  end_valid = GST_CLOCK_TIME_IS_VALID (end);
 
   GST_DEBUG_OBJECT (basesink, "got times start: %" GST_TIME_FORMAT
       ", end: %" GST_TIME_FORMAT, GST_TIME_ARGS (start), GST_TIME_ARGS (end));