summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2012-06-04 09:31:07 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-06-04 09:31:07 +0200
commit7558fd21eeb0bf7fcaaf78dcc9159c05780e0b56 (patch)
treeb3b881087b70aa3b57a6b78292bea0b6c9ab7166
parent1c0764f764a9ce574cbea4ef0fdbd161f606ba12 (diff)
downloadgstreamer-7558fd21eeb0bf7fcaaf78dcc9159c05780e0b56.tar.gz
pad: Check via gst_pad_accept_caps() if a sinkpad accepts caps
instead of just checking if the pad template caps would allow the caps. The actually supported caps can be far more restrictive than the template caps and only checking for the template caps can cause incompatible caps to be set on a pad. Fixes bug #677335.
-rw-r--r--gst/gstpad.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/gstpad.c b/gst/gstpad.c
index e742c7caa4..4ea3140bae 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -2783,7 +2783,7 @@ gst_pad_configure_sink (GstPad * pad, GstCaps * caps)
gboolean res;
/* See if pad accepts the caps */
- if (!gst_caps_can_intersect (caps, gst_pad_get_pad_template_caps (pad)))
+ if (!gst_pad_accept_caps (pad, caps))
goto not_accepted;
/* set caps on pad if call succeeds */