projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e76c358
)
aggregator: Caps event always goes to the aggregate thread
author
Olivier Crête
<olivier.crete@collabora.com>
Sun, 21 May 2017 12:28:00 +0000
(14:28 +0200)
committer
Tim-Philipp Müller
<tim@centricular.com>
Sat, 2 Dec 2017 15:10:27 +0000
(15:10 +0000)
So no need to check it here.
https://bugzilla.gnome.org/show_bug.cgi?id=782918
libs/gst/base/gstaggregator.c
patch
|
blob
|
history
diff --git
a/libs/gst/base/gstaggregator.c
b/libs/gst/base/gstaggregator.c
index
1e5f5a1
..
18eb6d9
100644
(file)
--- a/
libs/gst/base/gstaggregator.c
+++ b/
libs/gst/base/gstaggregator.c
@@
-2606,12
+2606,10
@@
gst_aggregator_pad_event_func (GstPad * pad, GstObject * parent,
}
if (event) {
- gboolean is_caps = (GST_EVENT_TYPE (event) == GST_EVENT_CAPS);
-
if (!klass->sink_event (self, aggpad, event)) {
/* Copied from GstPad to convert boolean to a GstFlowReturn in
* the event handling func */
- ret =
is_caps ? GST_FLOW_NOT_NEGOTIATED :
GST_FLOW_ERROR;
+ ret = GST_FLOW_ERROR;
}
}