From 3edf0737d69a58beecb977817c897e4b718e1f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 27 Jan 2016 18:48:17 +0100 Subject: [PATCH] deinterlace: Check for subset instead of non-empty intersection for ACCEPT_CAPS --- gst/deinterlace/gstdeinterlace.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gst/deinterlace/gstdeinterlace.c b/gst/deinterlace/gstdeinterlace.c index d83340d615..6b8b39d145 100644 --- a/gst/deinterlace/gstdeinterlace.c +++ b/gst/deinterlace/gstdeinterlace.c @@ -2087,20 +2087,20 @@ gst_deinterlace_acceptcaps (GstDeinterlace * self, GstPad * pad, GstCaps * caps) if (self->mode == GST_DEINTERLACE_MODE_DISABLED || self->mode == GST_DEINTERLACE_MODE_AUTO) { ourcaps = gst_pad_get_pad_template_caps (pad); - ret = gst_caps_can_intersect (caps, ourcaps); + ret = gst_caps_is_subset (caps, ourcaps); gst_caps_unref (ourcaps); } else if (self->mode == GST_DEINTERLACE_MODE_INTERLACED) { ourcaps = gst_static_caps_get (&deinterlace_caps); - ret = gst_caps_can_intersect (caps, ourcaps); + ret = gst_caps_is_subset (caps, ourcaps); gst_caps_unref (ourcaps); } else if (self->mode == GST_DEINTERLACE_MODE_AUTO_STRICT) { ourcaps = gst_static_caps_get (&progressive_caps); - ret = gst_caps_can_intersect (caps, ourcaps); + ret = gst_caps_is_subset (caps, ourcaps); gst_caps_unref (ourcaps); if (!ret) { ourcaps = gst_static_caps_get (&deinterlace_caps); - ret = gst_caps_can_intersect (caps, ourcaps); + ret = gst_caps_is_subset (caps, ourcaps); gst_caps_unref (ourcaps); } } else {