mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-23 14:36:24 +00:00
sys/ximage/gstximagesrc.c: Actually use the display_name property so that we can dump any available X display. Fixes ...
Original commit message from CVS: Patch by: daniel fischer <dan at f3c dot com> * sys/ximage/gstximagesrc.c: (gst_ximage_src_start), (gst_ximage_src_get_caps): Actually use the display_name property so that we can dump any available X display. Fixes #445905.
This commit is contained in:
parent
a3719a4a15
commit
e359a41517
2 changed files with 11 additions and 2 deletions
|
@ -1,3 +1,12 @@
|
||||||
|
2007-06-11 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
|
Patch by: daniel fischer <dan at f3c dot com>
|
||||||
|
|
||||||
|
* sys/ximage/gstximagesrc.c: (gst_ximage_src_start),
|
||||||
|
(gst_ximage_src_get_caps):
|
||||||
|
Actually use the display_name property so that we can dump any
|
||||||
|
available X display. Fixes #445905.
|
||||||
|
|
||||||
2007-06-11 Wim Taymans <wim@fluendo.com>
|
2007-06-11 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
Patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com>
|
Patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com>
|
||||||
|
|
|
@ -207,7 +207,7 @@ gst_ximage_src_start (GstBaseSrc * basesrc)
|
||||||
#ifdef HAVE_XDAMAGE
|
#ifdef HAVE_XDAMAGE
|
||||||
s->last_ximage = NULL;
|
s->last_ximage = NULL;
|
||||||
#endif
|
#endif
|
||||||
return gst_ximage_src_open_display (s, NULL);
|
return gst_ximage_src_open_display (s, s->display_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
|
@ -903,7 +903,7 @@ gst_ximage_src_get_caps (GstBaseSrc * bs)
|
||||||
GstXContext *xcontext;
|
GstXContext *xcontext;
|
||||||
gint x, y, width, height;
|
gint x, y, width, height;
|
||||||
|
|
||||||
if ((!s->xcontext) && (!gst_ximage_src_open_display (s, NULL)))
|
if ((!s->xcontext) && (!gst_ximage_src_open_display (s, s->display_name)))
|
||||||
return gst_caps_copy (gst_pad_get_pad_template_caps (GST_BASE_SRC (s)->
|
return gst_caps_copy (gst_pad_get_pad_template_caps (GST_BASE_SRC (s)->
|
||||||
srcpad));
|
srcpad));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue