From d0777d87fb887eb988db0c992eebbf6bde0be94d Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 8 Oct 2008 09:29:00 +0000 Subject: 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. --- ChangeLog | 5 +++++ common | 2 +- sys/ximage/gstximagesrc.c | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f16cf35f..366c97ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-10-08 Edward Hervey + + * sys/ximage/gstximagesrc.c: (gst_ximage_src_stop): + Fix build for systems that don't have XDamage. + 2008-10-07 Wim Taymans * tests/examples/rtp/client-H263p.sdp: diff --git a/common b/common index ea93f2ed..46eefd2f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit ea93f2ed580bcc19322e4c07f677eda980c821eb +Subproject commit 46eefd2f8474ee748864c59635be87b5a29317d1 diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c index f6782b6b..5f02b958 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); -- cgit