summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-03-20 17:48:49 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-03-20 17:48:49 +0000
commit1cb3f3903bf2daa5ddfee8b5eb0000a413391118 (patch)
tree05dc4ed358e13dbabe42528440891473771d285f
parente20e15e5a2096dba0271fa5ed81065e79959237a (diff)
downloadgst-plugins-bad-1cb3f3903bf2daa5ddfee8b5eb0000a413391118.tar.gz
gst-plugins-bad-1cb3f3903bf2daa5ddfee8b5eb0000a413391118.tar.bz2
gst-plugins-bad-1cb3f3903bf2daa5ddfee8b5eb0000a413391118.zip
gst/selector/gstinputselector.c: Release the selector lock when pad alloc happens on a non selected pad.
Original commit message from CVS: * gst/selector/gstinputselector.c: (gst_selector_pad_class_init), (gst_selector_pad_event), (gst_selector_pad_bufferalloc), (gst_selector_pad_chain), (gst_input_selector_set_active_pad): Release the selector lock when pad alloc happens on a non selected pad.
-rw-r--r--ChangeLog7
-rw-r--r--gst/selector/gstinputselector.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e47296cc..1e2eb954 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
2008-03-20 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/selector/gstinputselector.c: (gst_selector_pad_class_init),
+ (gst_selector_pad_event), (gst_selector_pad_bufferalloc),
+ (gst_selector_pad_chain), (gst_input_selector_set_active_pad):
+ Release the selector lock when pad alloc happens on a non selected pad.
+
+2008-03-20 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * gst/selector/gstinputselector.c: (gst_selector_pad_class_init),
(gst_selector_pad_init), (gst_selector_pad_set_property),
(gst_selector_pad_get_property), (gst_selector_pad_event),
(gst_selector_pad_bufferalloc), (gst_selector_pad_chain),
diff --git a/gst/selector/gstinputselector.c b/gst/selector/gstinputselector.c
index 852a9bec..4f169cf6 100644
--- a/gst/selector/gstinputselector.c
+++ b/gst/selector/gstinputselector.c
@@ -480,6 +480,8 @@ done:
/* ERRORS */
not_active:
{
+ GST_INPUT_SELECTOR_UNLOCK (sel);
+
/* unselected pad, perform fallback alloc or return unlinked when
* asked */
GST_OBJECT_LOCK (selpad);