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:
7e62ff2
)
funnel: Setting the PROXY_CAPS flag on the srcpad does not make much sense
author
Sebastian Dröge
<sebastian@centricular.com>
Fri, 20 Dec 2013 13:30:22 +0000
(14:30 +0100)
committer
Sebastian Dröge
<sebastian@centricular.com>
Thu, 26 Dec 2013 08:00:27 +0000
(09:00 +0100)
funnel outputs whatever one of the upstreams currently outputs, a caps
query to a random upstream does not give the right answer here.
plugins/elements/gstfunnel.c
patch
|
blob
|
history
diff --git
a/plugins/elements/gstfunnel.c
b/plugins/elements/gstfunnel.c
index 11dac55bfc9ad4f58f73e646393c59a90307e962..6a7dde5b8d64a14a1b69c100d1a4516941dbfba3 100644
(file)
--- a/
plugins/elements/gstfunnel.c
+++ b/
plugins/elements/gstfunnel.c
@@
-121,8
+121,6
@@
gst_funnel_init (GstFunnel * funnel)
"src");
gst_pad_use_fixed_caps (funnel->srcpad);
- GST_OBJECT_FLAG_SET (funnel->srcpad, GST_PAD_FLAG_PROXY_CAPS);
-
gst_element_add_pad (GST_ELEMENT (funnel), funnel->srcpad);
}