summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2012-01-26 10:30:25 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-01-26 10:45:45 +0100
commitde576f8163b69810393c2f0bfda6b6f2558e7141 (patch)
tree3845aeff49602234e6a15bb6fb3a1c0174c85cbb
parent6b9280b18c092ccd917ce60cc01832e74f9897f0 (diff)
collectpads2: Don't forward CAPS event automatically
-rw-r--r--libs/gst/base/gstcollectpads2.c2
-rw-r--r--libs/gst/base/gstcollectpads2.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/libs/gst/base/gstcollectpads2.c b/libs/gst/base/gstcollectpads2.c
index df3203c370..94066a69e2 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 64ae4ea0d8..630c59d1f5 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
*