[0.11] gstreamer: collectpads2: Don't forward CAPS event automatically

Sebastian Dröge slomo at kemper.freedesktop.org
Thu Jan 26 01:45:50 PST 2012


Module: gstreamer
Branch: 0.11
Commit: de576f8163b69810393c2f0bfda6b6f2558e7141
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=de576f8163b69810393c2f0bfda6b6f2558e7141

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Thu Jan 26 10:30:25 2012 +0100

collectpads2: Don't forward CAPS event automatically

---

 libs/gst/base/gstcollectpads2.c |    2 ++
 libs/gst/base/gstcollectpads2.h |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libs/gst/base/gstcollectpads2.c b/libs/gst/base/gstcollectpads2.c
index df3203c..94066a6 100644
--- a/libs/gst/base/gstcollectpads2.c
+++ b/libs/gst/base/gstcollectpads2.c
@@ -1742,6 +1742,8 @@ gst_collect_pads2_event (GstPad * pad, GstObject * parent, GstEvent * event)
        * accumulated and this is certainly not what we want. */
       goto forward_or_eat;
     }
+    case GST_EVENT_CAPS:
+      goto forward_or_eat;
     default:
       /* forward other events */
       goto forward_or_default;
diff --git a/libs/gst/base/gstcollectpads2.h b/libs/gst/base/gstcollectpads2.h
index 64ae4ea..630c59d 100644
--- a/libs/gst/base/gstcollectpads2.h
+++ b/libs/gst/base/gstcollectpads2.h
@@ -210,7 +210,7 @@ typedef gint (*GstCollectPads2CompareFunction) (GstCollectPads2 *pads,
  * ownership of the event and is responsible for forwarding
  * events downstream (with gst_pad_event_default()) or dropping events.
  *
- * The SEGMENT and EOS events should usually be dropped by this function.
+ * The SEGMENT, CAPS and EOS events should usually be dropped by this function.
  *
  * Returns: %TRUE if the pad could handle the event
  *



More information about the gstreamer-commits mailing list