virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavd/x11grab: disable drawing mouse without XFixes.

Browse Source 
Fix a segfault if the XFixes extension is not available on
the X11 server.
Can be reproduced using the VNC server.
This commit is contained in:
Nicolas George
2014-07-15 15:37:00 +02:00
parent dca22ab055
commit a65c0a3fe8
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavdevice/x11grab.c
View File

@@ -346,8 +346,9 @@ out:
* coordinates * coordinates
*/ */
static void static void
paint_mouse_pointer(XImage *image, struct x11grab *s) paint_mouse_pointer(XImage *image, AVFormatContext *s1)
{ {
struct x11grab *s = s1->priv_data;
int x_off = s->x_off; int x_off = s->x_off;
int y_off = s->y_off; int y_off = s->y_off;
int width = s->width; int width = s->width;
@@ -377,6 +378,12 @@ paint_mouse_pointer(XImage *image, struct x11grab *s)
XChangeWindowAttributes(dpy, w, CWCursor, &attr); XChangeWindowAttributes(dpy, w, CWCursor, &attr);
xcim = XFixesGetCursorImage(dpy); xcim = XFixesGetCursorImage(dpy);
if (!xcim) {
av_log(s1, AV_LOG_WARNING,
"XFixes extension not available, impossible to draw cursor\n");
s->draw_mouse = 0;
return;
}
x = xcim->x - xcim->xhot; x = xcim->x - xcim->xhot;
y = xcim->y - xcim->yhot; y = xcim->y - xcim->yhot;
@@ -573,7 +580,7 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
} }
if (s->draw_mouse) { if (s->draw_mouse) {
paint_mouse_pointer(image, s); paint_mouse_pointer(image, s1);
} }
return s->frame_size; return s->frame_size;