3 files changed, 9 insertions, 11 deletions
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c
index 0937c00312..7d2e9fb6a9 100644
--- a/libvo/vo_fbdev.c
+++ b/libvo/vo_fbdev.c
@@ -746,7 +746,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 {
     struct fb_cmap *cmap;
     int vm   = flags & VOFLAG_MODESWITCHING;
-    int zoom = flags & VOFLAG_SWSCALE;
 
     fs = flags & VOFLAG_FULLSCREEN;
 
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index f695c11fa9..df35932504 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -711,7 +711,7 @@ void vo_x11_classhint(struct vo *vo, Window window, const char *name)
     XClassHint wmClass;
     pid_t pid = getpid();
 
-    wmClass.res_name = opts->vo_winname ? opts->vo_winname : name;
+    wmClass.res_name = opts->vo_winname ? opts->vo_winname : (char *)name;
     wmClass.res_class = "MPlayer";
     XSetClassHint(x11->display, window, &wmClass);
     XChangeProperty(x11->display, window, x11->XA_NET_WM_PID, XA_CARDINAL,
@@ -1088,7 +1088,6 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y,
     goto final;
   if (x11->window_state & VOFLAG_HIDDEN) {
     XSizeHints hint;
-    XEvent xev;
     x11->window_state &= ~VOFLAG_HIDDEN;
     vo_x11_classhint(vo, x11->window, classname);
     XStoreName(mDisplay, x11->window, title);
@@ -1832,7 +1831,7 @@ static int transform_color(float val,
     return (unsigned short) (s * 65535);
 }
 
-uint32_t vo_x11_set_equalizer(struct vo *vo, char *name, int value)
+uint32_t vo_x11_set_equalizer(struct vo *vo, const char *name, int value)
 {
     float gamma, brightness, contrast;
     float rf, gf, bf;
@@ -1883,7 +1882,7 @@ uint32_t vo_x11_set_equalizer(struct vo *vo, char *name, int value)
     return VO_TRUE;
 }
 
-uint32_t vo_x11_get_equalizer(char *name, int *value)
+uint32_t vo_x11_get_equalizer(const char *name, int *value)
 {
     if (cmap == None)
         return VO_NOTAVAIL;
@@ -1899,7 +1898,7 @@ uint32_t vo_x11_get_equalizer(char *name, int *value)
 }
 
 #ifdef CONFIG_XV
-int vo_xv_set_eq(struct vo *vo, uint32_t xv_port, char *name, int value)
+int vo_xv_set_eq(struct vo *vo, uint32_t xv_port, const char *name, int value)
 {
     XvAttribute *attributes;
     int i, howmany, xv_atom;
@@ -1973,7 +1972,7 @@ int vo_xv_set_eq(struct vo *vo, uint32_t xv_port, char *name, int value)
     return VO_FALSE;
 }
 
-int vo_xv_get_eq(struct vo *vo, uint32_t xv_port, char *name, int *value)
+int vo_xv_get_eq(struct vo *vo, uint32_t xv_port, const char *name, int *value)
 {
 
     XvAttribute *attributes;
diff --git a/libvo/x11_common.h b/libvo/x11_common.h
index 32cffbb639..ba3d0e2617 100644
--- a/libvo/x11_common.h
+++ b/libvo/x11_common.h
@@ -130,8 +130,8 @@ int vo_x11_update_geometry(struct vo *vo, bool update_pos);
 void vo_x11_setlayer(struct vo *vo, Window vo_window, int layer);
 void vo_x11_uninit(struct vo *vo);
 Colormap vo_x11_create_colormap(struct vo *vo, XVisualInfo *vinfo);
-uint32_t vo_x11_set_equalizer(struct vo *vo, char *name, int value);
-uint32_t vo_x11_get_equalizer(char *name, int *value);
+uint32_t vo_x11_set_equalizer(struct vo *vo, const char *name, int value);
+uint32_t vo_x11_get_equalizer(const char *name, int *value);
 void fstype_help(void);
 void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis,
         int x, int y, unsigned int width, unsigned int height, int flags,
@@ -145,8 +145,8 @@ void vo_x11_ewmh_fullscreen(struct vo_x11_state *x11, int action);
 
 #endif
 
-int vo_xv_set_eq(struct vo *vo, uint32_t xv_port, char * name, int value);
-int vo_xv_get_eq(struct vo *vo, uint32_t xv_port, char * name, int *value);
+int vo_xv_set_eq(struct vo *vo, uint32_t xv_port, const char *name, int value);
+int vo_xv_get_eq(struct vo *vo, uint32_t xv_port, const char *name, int *value);
 
 int vo_xv_enable_vsync(struct vo *vo);