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:
3c87b88
)
caps: avoid doing logic in g_assert
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Wed, 24 Jun 2009 16:31:08 +0000
(18:31 +0200)
committer
Wim Taymans
<wim@metal.(none)>
Wed, 24 Jun 2009 16:31:08 +0000
(18:31 +0200)
Make sure we still do the right thing when glib is compiled without
assertions.
gst/gstcaps.c
patch
|
blob
|
history
diff --git
a/gst/gstcaps.c
b/gst/gstcaps.c
index 4962ec27c499c1beab177a53c68bc2c88f322310..ba33ed9fa26e6951865a8cbee81da5481878506e 100644
(file)
--- a/
gst/gstcaps.c
+++ b/
gst/gstcaps.c
@@
-1379,7
+1379,8
@@
gst_caps_subtract (const GstCaps * minuend, const GstCaps * subtrahend)
You can only remove everything or nothing and that is done above.
Note: there's a test that checks this behaviour. */
g_return_val_if_fail (!gst_caps_is_any (minuend), NULL);
- g_assert ((sublen = subtrahend->structs->len) > 0);
+ sublen = subtrahend->structs->len;
+ g_assert (sublen > 0);
src = gst_caps_copy (minuend);
for (i = 0; i < sublen; i++) {