diff options
| author | Christian Kirbach <Christian.Kirbach@googlemail.com> | 2007-04-24 20:45:24 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2007-04-24 20:45:24 +0000 |
| commit | 80b16b3a4e31c124b08d472a469fd15c97d8d640 (patch) | |
| tree | 648b56ce4afb905ad0115ee91a96104de8a8fd64 | |
| parent | 84c824b952c195f0214759a9842ba9790d7a8e1a (diff) | |
sys/ximage/ximagesink.c: Fix build if XShm is not available (#432362).
Original commit message from CVS:
Patch by: Christian Kirbach <Christian dot Kirbach at googlemail com>
* sys/ximage/ximagesink.c:
Fix build if XShm is not available (#432362).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sys/ximage/ximagesink.c | 3 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2007-04-24 Tim-Philipp Müller <tim at centricular dot net> + + Patch by: Christian Kirbach <Christian dot Kirbach at googlemail com> + + * sys/ximage/ximagesink.c: + Fix build if XShm is not available (#432362). + 2007-04-24 Sebastian Dröge <slomo@circular-chaos.org> * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_init): diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index 3ecd8055..af50cc0f 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -293,7 +293,6 @@ gst_ximage_buffer_get_type (void) /* X11 stuff */ -#ifdef HAVE_XSHM /* Check that XShm calls actually work */ static gboolean error_caught = FALSE; static int @@ -307,6 +306,8 @@ gst_ximagesink_handle_xerror (Display * display, XErrorEvent * xevent) return 0; } +#ifdef HAVE_XSHM /* Check that XShm calls actually work */ + static gboolean gst_ximagesink_check_xshm_calls (GstXImageSink * ximagesink, GstXContext * xcontext) |