generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avdevice/x11grab: allocate just one Cursor

Browse Source 
Fixes resource leak and Ticket2450

Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1ee8fadb81)
This commit is contained in:
Michael Niedermayer
2013-06-20 20:20:56 +02:00
committed by Carl Eugen Hoyos
parent 073bde2b1f
commit fbb1af39e4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavdevice/x11grab.c
View File

@@ -78,6 +78,7 @@ struct x11grab {
int show_region; /**< set by a private option. */ int show_region; /**< set by a private option. */
char *framerate; /**< Set by a private option. */ char *framerate; /**< Set by a private option. */
Cursor c;
Window region_win; /**< This is used by show_region option. */ Window region_win; /**< This is used by show_region option. */
}; };
@@ -353,7 +354,6 @@ paint_mouse_pointer(XImage *image, struct x11grab *s)
* Anyone who performs further investigation of the xlib API likely risks * Anyone who performs further investigation of the xlib API likely risks
* permanent brain damage. */ * permanent brain damage. */
uint8_t *pix = image->data; uint8_t *pix = image->data;
Cursor c;
Window w; Window w;
XSetWindowAttributes attr; XSetWindowAttributes attr;
@@ -361,9 +361,10 @@ paint_mouse_pointer(XImage *image, struct x11grab *s)
if (image->bits_per_pixel != 24 && image->bits_per_pixel != 32) if (image->bits_per_pixel != 24 && image->bits_per_pixel != 32)
return; return;
c = XCreateFontCursor(dpy, XC_left_ptr); if(!s->c)
s->c = XCreateFontCursor(dpy, XC_left_ptr);
w = DefaultRootWindow(dpy); w = DefaultRootWindow(dpy);
attr.cursor = c; attr.cursor = s->c;
XChangeWindowAttributes(dpy, w, CWCursor, &attr); XChangeWindowAttributes(dpy, w, CWCursor, &attr);
xcim = XFixesGetCursorImage(dpy); xcim = XFixesGetCursorImage(dpy);