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:
14f5518
)
Revert "pad: Check for subsets, not non-empty intersections to check if caps are...
author
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Thu, 8 Sep 2011 11:26:01 +0000
(13:26 +0200)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Thu, 8 Sep 2011 11:42:52 +0000
(13:42 +0200)
This reverts commit
0c5d50207326d74a4805bcd898bfac887540f12b
.
See bug #658541.
gst/gstpad.c
patch
|
blob
|
history
diff --git
a/gst/gstpad.c
b/gst/gstpad.c
index
0677f1a
..
6c1ef51
100644
(file)
--- a/
gst/gstpad.c
+++ b/
gst/gstpad.c
@@
-2554,7
+2554,7
@@
gst_pad_acceptcaps_default (GstPad * pad, GstCaps * caps)
GST_DEBUG_OBJECT (pad, "allowed caps %" GST_PTR_FORMAT, allowed);
- result = gst_caps_
is_subset (caps, allowed
);
+ result = gst_caps_
can_intersect (allowed, caps
);
gst_caps_unref (allowed);
@@
-2760,7
+2760,7
@@
gst_pad_configure_sink (GstPad * pad, GstCaps * caps)
gboolean res;
/* See if pad accepts the caps */
- if (!gst_caps_
is_subse
t (caps, gst_pad_get_pad_template_caps (pad)))
+ if (!gst_caps_
can_intersec
t (caps, gst_pad_get_pad_template_caps (pad)))
goto not_accepted;
/* set caps on pad if call succeeds */