summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2005-09-28 13:38:02 +0000
committerWim Taymans <wim.taymans@gmail.com>2005-09-28 13:38:02 +0000
commitc57846540520eccf35acc6a0366ecefc76838d6f (patch)
tree597792d5011c9b00249bdc6c78cf89b0d79249ca
parent425c9dd2c4327a1549fc26fd1b02b98fe723f230 (diff)
downloadgst-plugins-bad-c57846540520eccf35acc6a0366ecefc76838d6f.tar.gz
gst-plugins-bad-c57846540520eccf35acc6a0366ecefc76838d6f.tar.bz2
gst-plugins-bad-c57846540520eccf35acc6a0366ecefc76838d6f.zip
gst/qtdemux/qtdemux.c: No need to take stream lock here.
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header): No need to take stream lock here.
-rw-r--r--ChangeLog5
-rw-r--r--gst/qtdemux/qtdemux.c9
2 files changed, 6 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 27d1d28d..70d9d00a 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 d31505b3..529c828f 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