From 2b8f4868ee9cceed9fe6a037ba8dbce7795264b8 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 17 Jul 2008 14:21:30 +0000 Subject: [PATCH] sys/xvimage/xvimagesink.c: Oops - set the size of the image used for probing back to 1x1, for consistency with ximage... Original commit message from CVS: * sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls): Oops - set the size of the image used for probing back to 1x1, for consistency with ximagesink --- ChangeLog | 6 ++++++ sys/xvimage/xvimagesink.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb326f4f51..cf1750ea68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-17 Jan Schmidt + + * sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls): + Oops - set the size of the image used for probing back to 1x1, for + consistency with ximagesink + 2008-07-17 Jan Schmidt * sys/ximage/ximagesink.c: (gst_ximagesink_check_xshm_calls), diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index acc5a8b0cf..df5c48b512 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -426,9 +426,9 @@ gst_xvimagesink_check_xshm_calls (GstXContext * xcontext) handler = XSetErrorHandler (gst_xvimagesink_handle_xerror); /* Trying to create a 1x1 picture */ - GST_DEBUG ("XvShmCreateImage of 100x100"); + GST_DEBUG ("XvShmCreateImage of 1x1"); xvimage = XvShmCreateImage (xcontext->disp, xcontext->xv_port_id, - xcontext->im_format, NULL, 100, 100, &SHMInfo); + xcontext->im_format, NULL, 1, 1, &SHMInfo); /* Might cause an error, sync to ensure it is noticed */ XSync (xcontext->disp, FALSE);