[gst-cvs] gst-plugins-good: videomixer: if we're not linked downstream, we can do any format
Edward Hervey
bilboed at kemper.freedesktop.org
Fri Jun 4 02:51:39 PDT 2010
Module: gst-plugins-good
Branch: master
Commit: 2ff87c0fb9e93eb956715adc46c32704370556ab
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=2ff87c0fb9e93eb956715adc46c32704370556ab
Author: Edward Hervey <bilboed at bilboed.com>
Date: Fri Jun 4 11:44:09 2010 +0200
videomixer: if we're not linked downstream, we can do any format
Stupid me, assuming _get_allowed_caps() would actually return the
pad templates if there was no peer.
---
gst/videomixer/videomixer.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index 1f57565..22740e6 100644
--- 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);
More information about the Gstreamer-commits
mailing list