gst/gstcaps.c: Comparing NULL against !NULL yields different caps, not a failure.

Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_is_equal):
Comparing NULL against !NULL yields different caps, not a
failure.

diff --git a/ChangeLog b/ChangeLog
index 511ea7b..c70df0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-12-05  Wim Taymans  <wim@fluendo.com>
 
+       * gst/gstcaps.c: (gst_caps_is_equal):
+       Comparing NULL against !NULL yields different caps, not a
+       failure.
+
+2005-12-05  Wim Taymans  <wim@fluendo.com>
+
        * gst/gstpipeline.c:
        Fix small typo in docs.
 

diff --git a/gst/gstcaps.c b/gst/gstcaps.c
index 5300e58..c58b659 100644 (file)
--- a/gst/gstcaps.c
+++ b/gst/gstcaps.c
@@ -872,8 +872,10 @@ gst_caps_is_equal (const GstCaps * caps1, const GstCaps * caps2)
   if (caps1 == caps2)
     return TRUE;
 
-  g_return_val_if_fail (caps1 != NULL, FALSE);
-  g_return_val_if_fail (caps2 != NULL, FALSE);
+  /* one of them NULL => they are different (can't be both NULL because
+   * we checked that above) */
+  if (caps1 == NULL || caps2 == NULL)
+    return FALSE;
 
   if (gst_caps_is_fixed (caps1) && gst_caps_is_fixed (caps2))
     return gst_caps_is_equal_fixed (caps1, caps2);