summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2008-10-08 09:29:00 +0000
committerEdward Hervey <bilboed@bilboed.com>2008-10-08 09:29:00 +0000
commitd0777d87fb887eb988db0c992eebbf6bde0be94d (patch)
tree434d522b7cf1aefee676c055f98116df05f08562
parenta3dd91a4ae8c8bed8726179501331576d4c217c4 (diff)
sys/ximage/gstximagesrc.c: Fix build for systems that don't have XDamage.
Original commit message from CVS: * sys/ximage/gstximagesrc.c: (gst_ximage_src_stop): Fix build for systems that don't have XDamage.
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--sys/ximage/gstximagesrc.c4
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f16cf35f3..366c97ac6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-08 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * sys/ximage/gstximagesrc.c: (gst_ximage_src_stop):
+ Fix build for systems that don't have XDamage.
+
2008-10-07 Wim Taymans <wim.taymans@collabora.co.uk>
* tests/examples/rtp/client-H263p.sdp:
diff --git a/common b/common
-Subproject ea93f2ed580bcc19322e4c07f677eda980c821e
+Subproject 46eefd2f8474ee748864c59635be87b5a29317d
diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c
index f6782b6b1..5f02b958c 100644
--- a/sys/ximage/gstximagesrc.c
+++ b/sys/ximage/gstximagesrc.c
@@ -222,15 +222,19 @@ gst_ximage_src_stop (GstBaseSrc * basesrc)
{
GstXImageSrc *src = GST_XIMAGE_SRC (basesrc);
+#ifdef HAVE_XDAMAGE
if (src->last_ximage)
gst_buffer_unref (GST_BUFFER_CAST (src->last_ximage));
src->last_ximage = NULL;
+#endif
gst_ximage_src_clear_bufpool (src);
+#ifdef HAVE_XFIXES
if (src->cursor_image)
XFree (src->cursor_image);
src->cursor_image = NULL;
+#endif
if (src->xcontext) {
g_mutex_lock (src->x_lock);