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:
ad9450e
)
gstvalue: Allow NULL dest when subtracting bitmask
author
Edward Hervey
<edward.hervey@collabora.co.uk>
Fri, 6 Jan 2012 14:01:24 +0000
(15:01 +0100)
committer
Edward Hervey
<edward.hervey@collabora.co.uk>
Fri, 6 Jan 2012 14:01:24 +0000
(15:01 +0100)
Happens when checking for subsets of caps
gst/gstvalue.c
patch
|
blob
|
history
diff --git
a/gst/gstvalue.c
b/gst/gstvalue.c
index
0cafa4a
..
a2aa703
100644
(file)
--- a/
gst/gstvalue.c
+++ b/
gst/gstvalue.c
@@
-4822,7
+4822,6
@@
gst_value_subtract_bitmask_bitmask (GValue * dest,
{
guint64 m, s, r;
- g_return_val_if_fail (dest != NULL, FALSE);
g_return_val_if_fail (GST_VALUE_HOLDS_BITMASK (minuend), FALSE);
g_return_val_if_fail (GST_VALUE_HOLDS_BITMASK (subtrahend), FALSE);
@@
-4830,9
+4829,10
@@
gst_value_subtract_bitmask_bitmask (GValue * dest,
s = subtrahend->data[0].v_uint64;
r = m & (~s);
- g_value_init (dest, GST_TYPE_BITMASK);
- gst_value_set_bitmask (dest, r);
-
+ if (dest) {
+ g_value_init (dest, GST_TYPE_BITMASK);
+ gst_value_set_bitmask (dest, r);
+ }
return (r != 0);
}