diff --git a/ChangeLog b/ChangeLog
index 27d1d28daa..70d9d00a8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-28  Wim Taymans  <wim@fluendo.com>
+
+	* gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header):
+	No need to take stream lock here.
+
 2005-09-26  Christian Schaller  <uraeus@gnome.org>
 
 	* configure.ac: add speed and rfb where needed
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index d31505b3a5..529c828f8a 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -506,11 +506,6 @@ gst_qtdemux_loop_header (GstPad * pad)
   int size;
   GstFlowReturn ret;
 
-  /* FIXME _tell gets the offset wrong */
-  //cur_offset = gst_bytestream_tell(qtdemux->bs);
-
-  GST_STREAM_LOCK (pad);
-
   cur_offset = qtdemux->offset;
   GST_DEBUG ("loop at position %" G_GUINT64_FORMAT ", state %d",
       cur_offset, qtdemux->state);
@@ -695,14 +690,12 @@ gst_qtdemux_loop_header (GstPad * pad)
       g_error ("State=%d", qtdemux->state);
   }
 
-  GST_STREAM_UNLOCK (pad);
-
   return;
 
 pause:
   GST_LOG_OBJECT (qtdemux, "pausing task");
   gst_pad_pause_task (qtdemux->sinkpad);
-  GST_STREAM_UNLOCK (pad);
+  return;
 }
 
 static gboolean