[FFmpeg-cvslog] x11grab: fix mixed declaration and code

Michael Niedermayer git at videolan.org
Mon Oct 29 22:47:13 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 29 22:24:10 2012 +0100| [11d695d120d0249954b06646561cb43be04d8240] | committer: Michael Niedermayer

x11grab: fix mixed declaration and code

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11d695d120d0249954b06646561cb43be04d8240
---

 libavdevice/x11grab.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 4dddceb..6124006 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -353,14 +353,16 @@ paint_mouse_pointer(XImage *image, struct x11grab *s)
      * Anyone who performs further investigation of the xlib API likely risks
      * permanent brain damage. */
     uint8_t *pix = image->data;
+    Cursor c;
+    Window w;
+    XSetWindowAttributes attr;
 
     /* Code doesn't currently support 16-bit or PAL8 */
     if (image->bits_per_pixel != 24 && image->bits_per_pixel != 32)
         return;
 
-    Cursor c = XCreateFontCursor(dpy, XC_left_ptr);
-    Window w = DefaultRootWindow(dpy);
-    XSetWindowAttributes attr;
+    c = XCreateFontCursor(dpy, XC_left_ptr);
+    w = DefaultRootWindow(dpy);
     attr.cursor = c;
     XChangeWindowAttributes(dpy, w, CWCursor, &attr);
 



More information about the ffmpeg-cvslog mailing list