From 4967d4e3fd0ac94d635d41beb3b6e77b392a71e0 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 6 May 2010 09:17:33 +0300 Subject: [PATCH] videoscale: use can_intersect to avoid a caps copy --- gst/videoscale/gstvideoscale.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c index 00479e1b91..1844e4324a 100644 --- a/gst/videoscale/gstvideoscale.c +++ b/gst/videoscale/gstvideoscale.c @@ -356,16 +356,13 @@ static int gst_video_scale_get_format (GstCaps * caps) { gint i; - GstCaps *icaps, *scaps; + GstCaps *scaps; for (i = 0; i < G_N_ELEMENTS (gst_video_scale_format_caps); i++) { scaps = gst_static_caps_get (&gst_video_scale_format_caps[i]); - icaps = gst_caps_intersect (caps, scaps); - if (!gst_caps_is_empty (icaps)) { - gst_caps_unref (icaps); + if (gst_caps_can_intersect (caps, scaps)) { return i; } - gst_caps_unref (icaps); } return -1;