gstreamer: collectpads: do not unref flush_start twice

Mark Nauwelaerts mnauw at kemper.freedesktop.org
Mon Apr 23 08:05:55 PDT 2012


Module: gstreamer
Branch: master
Commit: 6802189d684c756b7950eb92cae23ef3243c565b
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=6802189d684c756b7950eb92cae23ef3243c565b

Author: Mark Nauwelaerts <mark.nauwelaerts at collabora.co.uk>
Date:   Mon Apr 23 17:04:57 2012 +0200

collectpads: do not unref flush_start twice

Based on patch by Matej Knopp <matej.knopp at gmail.com>

---

 libs/gst/base/gstcollectpads.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c
index 5eb5f5a..f40463c 100644
--- a/libs/gst/base/gstcollectpads.c
+++ b/libs/gst/base/gstcollectpads.c
@@ -1722,6 +1722,7 @@ gst_collect_pads_event_default (GstCollectPads * pads, GstCollectData * data,
       /* forward event to unblock check_collected */
       GST_DEBUG_OBJECT (pad, "forwarding flush start");
       res = gst_pad_event_default (pad, parent, event);
+      event = NULL;
 
       /* now unblock the chain function.
        * no cond per pad, so they all unblock,
@@ -1846,7 +1847,8 @@ gst_collect_pads_event_default (GstCollectPads * pads, GstCollectData * data,
   }
 
 eat:
-  gst_event_unref (event);
+  if (event)
+    gst_event_unref (event);
   return res;
 
 forward:



More information about the gstreamer-commits mailing list