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.
This commit is contained in:
Wim Taymans 2005-12-05 10:22:55 +00:00
parent 9d8037eed8
commit 39e0ac7465
2 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,9 @@
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:

View file

@ -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);