gst/base/gstbasesink.c: Unlock the PREROLL_LOCK in a failure case.

Original commit message from CVS:
2005-11-24  Michael Smith <msmith@fluendo.com>

* gst/base/gstbasesink.c: (gst_base_sink_handle_object):
Unlock the PREROLL_LOCK in a failure case.

diff --git a/ChangeLog b/ChangeLog
index 2c76813..48e9ca3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-24  Michael Smith <msmith@fluendo.com>
+
+       * gst/base/gstbasesink.c: (gst_base_sink_handle_object):
+         Unlock the PREROLL_LOCK in a failure case.
+
 2005-11-24  Wim Taymans  <wim@fluendo.com>
 
        * docs/gst/gstreamer-sections.txt:

diff --git a/gst/base/gstbasesink.c b/gst/base/gstbasesink.c
index b80054b..d1db11c 100644 (file)
--- a/gst/base/gstbasesink.c
+++ b/gst/base/gstbasesink.c
@@ -748,6 +748,7 @@ preroll_failed:
   {
     GST_DEBUG_OBJECT (basesink, "preroll failed");
     gst_base_sink_preroll_queue_flush (basesink, pad);
+    GST_PAD_PREROLL_UNLOCK (pad);
 
     GST_DEBUG_OBJECT (basesink, "abort state");
     gst_element_abort_state (GST_ELEMENT (basesink));

diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index b80054b..d1db11c 100644 (file)
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -748,6 +748,7 @@ preroll_failed:
   {
     GST_DEBUG_OBJECT (basesink, "preroll failed");
     gst_base_sink_preroll_queue_flush (basesink, pad);
+    GST_PAD_PREROLL_UNLOCK (pad);
 
     GST_DEBUG_OBJECT (basesink, "abort state");
     gst_element_abort_state (GST_ELEMENT (basesink));