From 8e6b5c7acf058908eae2bcb602ad6ab057db2e03 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 2 Jun 2012 20:01:01 +0200 Subject: [PATCH] Revert "pad: Return FALSE if pushing of sticky events failed" This reverts commit 0f924b922c712059d7752fc15b832551745ff27e. Sticky events should always return TRUE when pushing and will only cause failures during data flow later. --- gst/gstpad.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gst/gstpad.c b/gst/gstpad.c index 79bbb2e..ad44d83 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -4447,7 +4447,7 @@ idle_probe_stopped: gboolean gst_pad_push_event (GstPad * pad, GstEvent * event) { - gboolean res = TRUE; + gboolean res; GstPadProbeType type; gboolean sticky, serialized; @@ -4487,13 +4487,12 @@ gst_pad_push_event (GstPad * pad, GstEvent * event) * sticky events */ res = (check_sticky (pad) == GST_FLOW_OK); } - - /* If pushing sticky events did not fail and this is no sticky event - * push it right away */ - if (res && !sticky) { + if (!sticky) { + /* other events are pushed right away */ res = (gst_pad_push_event_unchecked (pad, event, type) == GST_FLOW_OK); } else { gst_event_unref (event); + res = TRUE; } GST_OBJECT_UNLOCK (pad); -- 2.7.4