projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
646d436
)
caps: this is internal API where we need to ensure !NULL higher up
author
Stefan Kost
<ensonic@users.sf.net>
Wed, 3 Mar 2010 21:34:58 +0000
(23:34 +0200)
committer
Stefan Kost
<ensonic@users.sf.net>
Mon, 15 Mar 2010 09:17:22 +0000
(11:17 +0200)
gst/gstcaps.c
patch
|
blob
|
history
diff --git
a/gst/gstcaps.c
b/gst/gstcaps.c
index
c0ebf4a
..
2804cd9
100644
(file)
--- a/
gst/gstcaps.c
+++ b/
gst/gstcaps.c
@@
-1218,8
+1218,8
@@
gst_caps_structure_intersect (const GstStructure * struct1,
{
IntersectData data;
{
IntersectData data;
- g_
return_val_if_fail (struct1 != NULL,
NULL);
- g_
return_val_if_fail (struct2 != NULL,
NULL);
+ g_
assert (struct1 !=
NULL);
+ g_
assert (struct2 !=
NULL);
if (G_UNLIKELY (struct1->name != struct2->name))
return NULL;
if (G_UNLIKELY (struct1->name != struct2->name))
return NULL;
@@
-1278,8
+1278,8
@@
static gboolean
gst_caps_structure_can_intersect (const GstStructure * struct1,
const GstStructure * struct2)
{
gst_caps_structure_can_intersect (const GstStructure * struct1,
const GstStructure * struct2)
{
- g_
return_val_if_fail (struct1 != NULL, FALSE
);
- g_
return_val_if_fail (struct2 != NULL, FALSE
);
+ g_
assert (struct1 != NULL
);
+ g_
assert (struct2 != NULL
);
if (G_UNLIKELY (struct1->name != struct2->name))
return FALSE;
if (G_UNLIKELY (struct1->name != struct2->name))
return FALSE;