summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sys/xvimage/xvimagesink.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cb326f4f..cf1750ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-07-17 Jan Schmidt <Jan.Schmidt@sun.com>
+ * 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 <Jan.Schmidt@sun.com>
+
* sys/ximage/ximagesink.c: (gst_ximagesink_check_xshm_calls),
(gst_ximagesink_ximage_new):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls),
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index acc5a8b0..df5c48b5 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);