mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-17 22:06:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gstcaps.c: Previous commit was wrong NULL caps does not exist and indicate an error, so also add a FIXME to gst_c...

Browse source 
Original commit message from CVS:
* gst/gstcaps.c:
Previous commit was wrong NULL caps does not exist
and indicate an error, so also add a FIXME to
gst_caps_is_equal where NULL caps are accepted.
This commit is contained in:
Thijs Vermeir 2008-07-22 00:29:55 +00:00
parent 6f1ab17974
commit cdb1ea97cc
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-07-22 Thijs Vermeir <thijsvermeir@gmail.com>
* gst/gstcaps.c:
Previous commit was wrong NULL caps does not exist
and indicate an error, so also add a FIXME to
gst_caps_is_equal where NULL caps are accepted.
2008-07-22 Thijs Vermeir <thijsvermeir@gmail.com> 2008-07-22 Thijs Vermeir <thijsvermeir@gmail.com>
* gst/gstcaps.c: * gst/gstcaps.c:

14
gst/gstcaps.c
View file

@ -1063,6 +1063,9 @@ gst_caps_is_subset (const GstCaps * subset, const GstCaps * superset)
gboolean gboolean
gst_caps_is_equal (const GstCaps * caps1, const GstCaps * caps2) gst_caps_is_equal (const GstCaps * caps1, const GstCaps * caps2)
{ {
/* FIXME 0.11: NULL pointers are no valid Caps but indicate an error
* So there should be an assertion that caps1 and caps2 != NULL */
/* NULL <-> NULL is allowed here */ /* NULL <-> NULL is allowed here */
if (caps1 == caps2) if (caps1 == caps2)
return TRUE; return TRUE;
@ -1406,8 +1409,6 @@ gst_caps_subtract (const GstCaps * minuend, const GstCaps * subtrahend)
* Creates a new #GstCaps that contains all the formats that are in * Creates a new #GstCaps that contains all the formats that are in
* either @caps1 and @caps2. * either @caps1 and @caps2.
* *
* This function deals correctly with passing NULL for any of the caps.
*
* Returns: the new #GstCaps * Returns: the new #GstCaps
*/ */
GstCaps * GstCaps *
@ -1416,13 +1417,14 @@ gst_caps_union (const GstCaps * caps1, const GstCaps * caps2)
GstCaps *dest1; GstCaps *dest1;
GstCaps *dest2; GstCaps *dest2;
if (!caps1 && !caps2) /* NULL pointers are no correct GstCaps */
return gst_caps_new_empty (); g_return_val_if_fail (caps1 != NULL, NULL);
g_return_val_if_fail (caps2 != NULL, NULL);
if (!caps1 || gst_caps_is_empty (caps1)) if (gst_caps_is_empty (caps1))
return gst_caps_copy (caps2); return gst_caps_copy (caps2);
if (!caps2 || gst_caps_is_empty (caps2)) if (gst_caps_is_empty (caps2))
return gst_caps_copy (caps1); return gst_caps_copy (caps1);
if (gst_caps_is_any (caps1) || gst_caps_is_any (caps2)) if (gst_caps_is_any (caps1) || gst_caps_is_any (caps2))