summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sys/xvimage/xvimagesink.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4bd31b1d..e360c900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-11 Stefan Kost <ensonic@users.sf.net>
+
+ * sys/xvimage/xvimagesink.c:
+ Don't assert on caps==NULL.
+
2008-10-10 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/subparse/gstsubparse.c:
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index a47524a0..0b87a2bd 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -517,6 +517,9 @@ gst_xvimagesink_xvimage_new (GstXvImageSink * xvimagesink, GstCaps * caps)
g_return_val_if_fail (GST_IS_XVIMAGESINK (xvimagesink), NULL);
+ if (caps == NULL)
+ return NULL;
+
xvimage = (GstXvImageBuffer *) gst_mini_object_new (GST_TYPE_XVIMAGE_BUFFER);
GST_DEBUG_OBJECT (xvimage, "Creating new XvImageBuffer");