From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Thu, 8 Sep 2011 11:26:01 +0000 (+0200)
Subject: Revert "pad: Check for subsets, not non-empty intersections to check if caps are... 
X-Git-Tag: RELEASE-0.10.36~167
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2bfada5581e35a2d37188f48a2c7442644f10bb3;p=platform%2Fupstream%2Fgstreamer.git

Revert "pad: Check for subsets, not non-empty intersections to check if caps are compatible"

This reverts commit 0c5d50207326d74a4805bcd898bfac887540f12b.

See bug #658541.
---

diff --git a/gst/gstpad.c b/gst/gstpad.c
index 0677f1a..6c1ef51 100644
--- 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_subset (caps, gst_pad_get_pad_template_caps (pad)))
+  if (!gst_caps_can_intersect (caps, gst_pad_get_pad_template_caps (pad)))
     goto not_accepted;
 
   /* set caps on pad if call succeeds */