ffmpeg | branch: master | Antonio Ospite <[email protected]> | Mon Sep 8 13:15:18 2014 +0200| [5a8e51f661bffe5dcc7c806140f0320b544d6e9e] | committer: Michael Niedermayer
avdevice/x11grab: rename the "w" Window to "root" in paint_mouse_pointer This specifies better the meaning of the variable, and is also in preparation of a subsequent change which will introduce a temporary Window variable for which "w" is an good name. Signed-off-by: Antonio Ospite <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a8e51f661bffe5dcc7c806140f0320b544d6e9e --- libavdevice/x11grab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index e0d1dfa..4379e1b 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -389,7 +389,7 @@ static void paint_mouse_pointer(XImage *image, AVFormatContext *s1) * Anyone who performs further investigation of the xlib API likely risks * permanent brain damage. */ uint8_t *pix = image->data; - Window w; + Window root; XSetWindowAttributes attr; /* Code doesn't currently support 16-bit or PAL8 */ @@ -398,9 +398,9 @@ static void paint_mouse_pointer(XImage *image, AVFormatContext *s1) if (!s->c) s->c = XCreateFontCursor(dpy, XC_left_ptr); - w = DefaultRootWindow(dpy); + root = DefaultRootWindow(dpy); attr.cursor = s->c; - XChangeWindowAttributes(dpy, w, CWCursor, &attr); + XChangeWindowAttributes(dpy, root, CWCursor, &attr); xcim = XFixesGetCursorImage(dpy); if (!xcim) { _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
