From 56125511dc2a4c99fa893a2ee213659c5b726d63 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Fri, 9 May 2003 19:00:30 +0000 Subject: [PATCH] Merge fix for #112596 from HEAD Original commit message from CVS: Merge fix for #112596 from HEAD --- gst/gstcaps.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gst/gstcaps.c b/gst/gstcaps.c index b795c4225d..ea3a579934 100644 --- a/gst/gstcaps.c +++ b/gst/gstcaps.c @@ -740,16 +740,21 @@ gst_caps_is_always_compatible (GstCaps *fromcaps, GstCaps *tocaps) while (fromcaps) { GstCaps *destcaps = tocaps; + /* assume caps is incompatible */ + gboolean compat = FALSE; - while (destcaps) { - if (gst_caps_check_compatibility_func (fromcaps, destcaps)) - return TRUE; - + while (destcaps && !compat) { + if (gst_caps_check_compatibility_func (fromcaps, destcaps)) { + compat = TRUE; + } destcaps = destcaps->next; } + if (!compat) + return FALSE; + fromcaps = fromcaps->next; } - return FALSE; + return TRUE; } static GstCaps*