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

[Sebastian Dröge]

Module: gstreamer
Branch: 0.11
Commit: 0bc6d49c950210bf422615fb8dc98c5adcd5e456
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=0bc6d49c950210bf422615fb8dc98c5adcd5e456

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Thu Sep  8 13:26:24 2011 +0200

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

This reverts commit 5e5cc5e89e7e2858a6352fa4c81a374f6e5a6297.

See bug #658541.

---

 libs/gst/base/gstbasetransform.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c
index 51a66e0..5c36825 100644
--- a/libs/gst/base/gstbasetransform.c
+++ b/libs/gst/base/gstbasetransform.c
@@ -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)