summaryrefslogtreecommitdiff
path: root/plugins/elements/gstqueue.c
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2005-03-07 18:27:42 +0000
committerWim Taymans <wim.taymans@gmail.com>2005-03-07 18:27:42 +0000
commitc47dc4d8537a2cf09e830b8e8fef455306bb7e3e (patch)
tree52648c38eaf8eb9b206078ad5f134ec5f3fa914b /plugins/elements/gstqueue.c
parentd5e9b91e0aa074b93135300a5e31a6e0a850a18c (diff)
First THREADED backport attempt, focusing on adding locks and making sure the API is threadsafe. Needs more work. Mor...
Original commit message from CVS: First THREADED backport attempt, focusing on adding locks and making sure the API is threadsafe. Needs more work. More docs follow this week.
Diffstat (limited to 'plugins/elements/gstqueue.c')
-rw-r--r--plugins/elements/gstqueue.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index b9ade2405..0ed213dd7 100644
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -434,6 +434,8 @@ gst_queue_link_sink (GstPad * pad, const GstCaps * caps)
GST_QUEUE_MUTEX_UNLOCK;
}
+ link_ret = GST_PAD_LINK_OK;
+#if 0
link_ret = gst_pad_proxy_pad_link (pad, caps);
if (GST_PAD_LINK_SUCCESSFUL (link_ret)) {
@@ -441,6 +443,7 @@ gst_queue_link_sink (GstPad * pad, const GstCaps * caps)
* the pads become unnegotiated while we have buffers */
gst_caps_replace (&queue->negotiated_caps, gst_caps_copy (caps));
}
+#endif
return link_ret;
}
@@ -459,8 +462,10 @@ gst_queue_link_src (GstPad * pad, const GstCaps * caps)
}
return GST_PAD_LINK_REFUSED;
}
-
+#if 0
link_ret = gst_pad_proxy_pad_link (pad, caps);
+#endif
+ link_ret = GST_PAD_LINK_OK;
if (GST_PAD_LINK_SUCCESSFUL (link_ret)) {
/* we store an extra copy of the negotiated caps, just in case