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:
53e4d1a
)
pad: avoid setting NULL caps on pads
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Mon, 16 May 2011 17:04:35 +0000
(19:04 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Mon, 16 May 2011 17:04:35 +0000
(19:04 +0200)
gst/gstpad.c
patch
|
blob
|
history
diff --git
a/gst/gstpad.c
b/gst/gstpad.c
index
22cfc46
..
448d87f
100644
(file)
--- a/
gst/gstpad.c
+++ b/
gst/gstpad.c
@@
-2715,7
+2715,7
@@
gst_pad_set_caps (GstPad * pad, GstCaps * caps)
gboolean res = TRUE;
g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
- g_return_val_if_fail (caps
== NULL ||
gst_caps_is_fixed (caps), FALSE);
+ g_return_val_if_fail (caps
!= NULL &&
gst_caps_is_fixed (caps), FALSE);
event = gst_event_new_caps (caps);