gst/gstpad.c: Follow-up to Wim's patch, solves deadlock for blocked and flushing...

Original commit message from CVS:
* gst/gstpad.c: (handle_pad_block):
Follow-up to Wim's patch, solves deadlock for blocked and flushing pads

diff --git a/ChangeLog b/ChangeLog
index 6ee427c5d5631410b1bf1a652549d7d898e867af..1911763de3dc549d6bdd3eb3c909e7204b76537b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-02  Edward Hervey  <edward@fluendo.com>
+
+       * gst/gstpad.c: (handle_pad_block):
+       Follow-up to Wim's patch, solves deadlock for blocked and flushing pads
+       
 2005-11-02  Wim Taymans  <wim@fluendo.com>
 
        * gst/gstbin.c:

diff --git a/gst/gstpad.c b/gst/gstpad.c
index ab084fd0652c7e9222b4ce83e2275163fc908107..5b4860023bcfc2d2fc78b9abab369ebbeb5878c3 100644 (file)
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -2981,6 +2981,8 @@ handle_pad_block (GstPad * pad)
   }
 
   while (GST_PAD_IS_BLOCKED (pad)) {
+    if (GST_PAD_IS_FLUSHING (pad))
+      goto flushing;
     GST_PAD_BLOCK_WAIT (pad);
     if (GST_PAD_IS_FLUSHING (pad))
       goto flushing;