projects
/
platform
/
upstream
/
gst-plugins-good.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
952fd66
)
videomixer: if we're not linked downstream, we can do any format
author
Edward Hervey
<bilboed@bilboed.com>
Fri, 4 Jun 2010 09:44:09 +0000
(11:44 +0200)
committer
Edward Hervey
<bilboed@bilboed.com>
Fri, 4 Jun 2010 09:44:09 +0000
(11:44 +0200)
Stupid me, assuming _get_allowed_caps() would actually return the
pad templates if there was no peer.
gst/videomixer/videomixer.c
patch
|
blob
|
history
diff --git
a/gst/videomixer/videomixer.c
b/gst/videomixer/videomixer.c
index 1f575659a1f8fe9d72e295f1c85de9673c7e45a0..22740e6acb9c0b1021ea2823e8b9fb3a14d39a3c 100644
(file)
--- a/
gst/videomixer/videomixer.c
+++ b/
gst/videomixer/videomixer.c
@@
-391,6
+391,10
@@
gst_videomixer_pad_sink_getcaps (GstPad * pad)
/* Get downstream allowed caps */
res = gst_pad_get_allowed_caps (mix->srcpad);
+ if (G_UNLIKELY (res == NULL)) {
+ res = gst_caps_copy (gst_pad_get_pad_template_caps (pad));
+ goto beach;
+ }
GST_VIDEO_MIXER_STATE_LOCK (mix);