mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "basetransform: Use check for subsets and not non-empty intersection to check if caps are compatible"

Browse source 
This reverts commit 5e5cc5e89e.

See bug #658541.
This commit is contained in:
Sebastian Dröge 2011-09-08 13:26:24 +02:00
parent 2bfada5581
commit 0bc6d49c95
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/gst/base/gstbasetransform.c
View file

@ -788,7 +788,7 @@ gst_base_transform_can_transform (GstBaseTransform * trans, GstPad * pad,
goto no_transform;
/* check if the out caps is a subset of the othercaps */
if (!gst_caps_is_subset (out, othercaps))
if (!gst_caps_can_intersect (out, othercaps))
goto no_subset;
if (othercaps)
@ -890,7 +890,7 @@ gst_base_transform_find_transform (GstBaseTransform * trans, GstPad * pad,
/* see if the target caps are a superset of the source caps, in this
* case we can try to perform passthrough */
if (gst_caps_is_subset (caps, othercaps)) {
if (gst_caps_can_intersect (othercaps, caps)) {
GST_DEBUG_OBJECT (trans, "try passthrough with %" GST_PTR_FORMAT, caps);
if (otherpeer) {
/* try passthrough. we know it's fixed, because caps is fixed */
@ -1080,7 +1080,7 @@ gst_base_transform_acceptcaps_default (GstBaseTransform * trans,
GST_DEBUG_OBJECT (trans, "allowed caps %" GST_PTR_FORMAT, allowed);
/* intersect with the requested format */
ret = gst_caps_is_subset (caps, allowed);
ret = gst_caps_can_intersect (allowed, caps);
gst_caps_unref (allowed);
if (!ret)