mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
This reverts commit 0c5d502073.

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

4
gst/gstpad.c
View file

@ -2554,7 +2554,7 @@ gst_pad_acceptcaps_default (GstPad * pad, GstCaps * caps)
GST_DEBUG_OBJECT (pad, "allowed caps %" GST_PTR_FORMAT, allowed); 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); gst_caps_unref (allowed);
@ -2760,7 +2760,7 @@ gst_pad_configure_sink (GstPad * pad, GstCaps * caps)
gboolean res; gboolean res;
/* See if pad accepts the caps */ /* 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; goto not_accepted;
/* set caps on pad if call succeeds */ /* set caps on pad if call succeeds */