aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice
diff options
context:
space:
mode:
authorAntonio Ospite <ao2@ao2.it>2014-09-08 13:15:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-09 02:22:01 +0200
commit5a8e51f661bffe5dcc7c806140f0320b544d6e9e (patch)
treede34e9c0a0590e23ed6e12c7ede84d18ba34b254 /libavdevice
parent02946120fc30022f367d5af646b84251c2456e2d (diff)
downloadffmpeg-5a8e51f661bffe5dcc7c806140f0320b544d6e9e.tar.gz
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 <ao2@ao2.it> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/x11grab.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index e0d1dfacfa..4379e1b1cd 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) {