summaryrefslogtreecommitdiffstats
path: root/sys/ximage
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2008-02-12 13:34:52 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2008-02-12 13:34:52 +0000
commit361c3c94c311b2914dd91c70480d8341db7f70c0 (patch)
treef1e7294c97a0339b96b31e91fd0afb7c41126db0 /sys/ximage
parentd62d8d9feaf027ffa359be07fa4b400da3648940 (diff)
sys/ximage/gstximagesrc.c: Initialise variables when opening the X display rather than in _start(), as the display ca...
Original commit message from CVS: * sys/ximage/gstximagesrc.c: Initialise variables when opening the X display rather than in _start(), as the display can be opened before that. Fixes: #515985
Diffstat (limited to 'sys/ximage')
-rw-r--r--sys/ximage/gstximagesrc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c
index 89b5838a..14227f80 100644
--- a/sys/ximage/gstximagesrc.c
+++ b/sys/ximage/gstximagesrc.c
@@ -161,6 +161,11 @@ gst_ximage_src_open_display (GstXImageSrc * s, const gchar * name)
int error_base;
long evmask = NoEventMask;
+ s->have_xdamage = FALSE;
+ s->damage = None;
+ s->damage_copy_gc = None;
+ s->damage_region = None;
+
if (XDamageQueryExtension (s->xcontext->disp, &s->damage_event_base,
&error_base)) {
s->damage =
@@ -206,9 +211,6 @@ gst_ximage_src_start (GstBaseSrc * basesrc)
s->last_frame_no = -1;
#ifdef HAVE_XDAMAGE
s->last_ximage = NULL;
- s->damage = None;
- s->damage_copy_gc = None;
- s->damage_region = None;
#endif
return gst_ximage_src_open_display (s, s->display_name);
}