From b68f9fef32971095836ea6bbeb2f12af417120d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux@gmail.com>
Date: Wed, 4 May 2011 22:12:55 +0200
Subject: cleanup: shut up more warnings

---
 libvo/vo_x11.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'libvo/vo_x11.c')

diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index ec85c7b747..8e34503bb9 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -306,12 +306,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
                        uint32_t d_height, uint32_t flags, char *title,
                        uint32_t format)
 {
-// int screen;
-
-// int interval, prefer_blank, allow_exp, nothing;
-    unsigned int fg, bg;
     Colormap theCmap;
-    XSetWindowAttributes xswa;
     unsigned long xswamask;
     const struct fmt2Xfmtentry_s *fmte = fmt2Xfmt;
 
@@ -358,22 +353,13 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
             vo_vm_switch();
         }
 #endif
-        bg = WhitePixel(mDisplay, mScreen);
-        fg = BlackPixel(mDisplay, mScreen);
-
         theCmap = vo_x11_create_colormap(&vinfo);
 
-        xswa.background_pixel = 0;
-        xswa.border_pixel = 0;
-        xswa.colormap = theCmap;
         xswamask = CWBackPixel | CWBorderPixel | CWColormap;
 
 #ifdef CONFIG_XF86VM
         if (vm)
-        {
-            xswa.override_redirect = True;
             xswamask |= CWOverrideRedirect;
-        }
 #endif
 
             vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, vo_dwidth, vo_dheight,
@@ -553,7 +539,7 @@ static int draw_slice(uint8_t * src[], int stride[], int w, int h,
         dst[0] += dstStride[0] * (image_height - 1);
         dstStride[0] = -dstStride[0];
     }
-    sws_scale(swsContext, src, stride, y, h, dst, dstStride);
+    sws_scale(swsContext, (const uint8_t **)src, stride, y, h, dst, dstStride);
     return 0;
 }
 
-- 
cgit v1.2.3