cosmetics: Remove useless parentheses from from return statements.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2

22 files changed, 82 insertions, 82 deletions

diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index b150b18012..d286f36005 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -368,7 +368,7 @@ static int mga_init(int width,int height,unsigned int format){
             mga_vid_config.format=MGA_VID_FORMAT_UYVY; break;
         default: 
             mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_MGA_InvalidOutputFormat,format);
-            return (-1);
+            return -1;
         }
 
 	mga_vid_config.src_width = width;
@@ -386,7 +386,7 @@ static int mga_init(int width,int height,unsigned int format){
 	if(width > 1024 && height > 1024)
 	{
 		mp_msg(MSGT_VO,MSGL_ERR, MGSTR_LIBVO_MGA_ResolutionTooHigh);
-		return (-1);
+		return -1;
 	} else if(height <= 1024)
 	{
 		// try whether we have a G550
@@ -397,7 +397,7 @@ static int mga_init(int width,int height,unsigned int format){
 			{
 				// we don't have a G550, so our resolution is too high
 				mp_msg(MSGT_VO,MSGL_ERR, MGSTR_LIBVO_MGA_ResolutionTooHigh);
-				return (-1);
+				return -1;
 			} else {
 				// there is a deeper problem
 				// we have a G550, but still couldn't configure mga_vid
@@ -457,7 +457,7 @@ static int preinit(const char *vo_subdevice)
 	{
 		perror("open");
 		mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_MGA_CouldntOpen,devname);
-		return(-1);
+		return -1;
 	}
 
 #ifdef VO_XMGA
diff --git a/libvo/vo_cvidix.c b/libvo/vo_cvidix.c
index 7dd74ee07b..0192b20264 100644
--- a/libvo/vo_cvidix.c
+++ b/libvo/vo_cvidix.c
@@ -134,7 +134,7 @@ static int draw_frame(uint8_t *src[]){
 }
 
 static int query_format(uint32_t format){
-  return(vidix_query_fourcc(format));
+  return vidix_query_fourcc(format);
 }
 
 static void uninit(void){
diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c
index ee381d020e..af1e89105e 100644
--- a/libvo/vo_dfbmga.c
+++ b/libvo/vo_dfbmga.c
@@ -917,11 +917,11 @@ query_format( uint32_t format )
                return 0;
      }
 
-     return (VFCAP_HWSCALE_UP |
+     return  VFCAP_HWSCALE_UP |
              VFCAP_HWSCALE_DOWN |
              VFCAP_CSP_SUPPORTED_BY_HW |
              VFCAP_CSP_SUPPORTED |
-             VFCAP_OSD);
+             VFCAP_OSD;
 }
 
 static void
diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c
index f194beeef0..eedafb717b 100644
--- a/libvo/vo_dga.c
+++ b/libvo/vo_dga.c
@@ -119,11 +119,11 @@ static int vd_EnableMode(int depth, int bitspp,
 static int vd_ModeEqual(int depth, int bitspp,
                         int rmask, int gmask, int bmask, int index)
 {
-    return ((vo_dga_modes[index].vdm_depth == depth &&
+    return  (vo_dga_modes[index].vdm_depth == depth &&
              vo_dga_modes[index].vdm_bitspp == bitspp &&
              vo_dga_modes[index].vdm_rmask == rmask &&
              vo_dga_modes[index].vdm_gmask == gmask &&
-             vo_dga_modes[index].vdm_bmask == bmask) ? 1 : 0);
+             vo_dga_modes[index].vdm_bmask == bmask) ? 1 : 0;
 }
 
 
@@ -964,7 +964,7 @@ static uint32_t get_image(mp_image_t * mpi)
         || (mpi->type == MP_IMGTYPE_STATIC && vo_dga_nr_video_buffers > 1)
         || (mpi->type == MP_IMGTYPE_IP && vo_dga_nr_video_buffers < 2)
         || (mpi->type == MP_IMGTYPE_IPB))
-        return (VO_FALSE);
+        return VO_FALSE;
 
     if ((mpi->flags & MP_IMGFLAG_ACCEPT_STRIDE) ||
         (mpi->flags & MP_IMGFLAG_ACCEPT_WIDTH &&
@@ -978,10 +978,10 @@ static uint32_t get_image(mp_image_t * mpi)
         mpi->width =
             (vo_dga_bytes_per_line + vo_dga_vp_skip) / (mpi->bpp / 8);
         mpi->flags |= MP_IMGFLAG_DIRECT;
-        return (VO_TRUE);
+        return VO_TRUE;
     }
 
-    return (VO_FALSE);
+    return VO_FALSE;
 }
 
 static int control(uint32_t request, void *data, ...)
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c
index a211cad37c..86dbc9b0d2 100644
--- a/libvo/vo_directfb2.c
+++ b/libvo/vo_directfb2.c
@@ -1429,7 +1429,7 @@ static int control(uint32_t request, void *data, ...)
 	value = va_arg(ap, int);
         va_end(ap);
     
-	return(directfb_set_video_eq(data, value));
+	return directfb_set_video_eq(data, value);
       }
     case VOCTRL_GET_EQUALIZER:
       {
@@ -1440,7 +1440,7 @@ static int control(uint32_t request, void *data, ...)
         value = va_arg(ap, int*);
         va_end(ap);
     
-	return(directfb_get_video_eq(data, value));
+	return directfb_get_video_eq(data, value);
       }
   };
   return VO_NOTIMPL;
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c
index 82e6344e41..1d70f5a18b 100644
--- a/libvo/vo_fbdev.c
+++ b/libvo/vo_fbdev.c
@@ -1038,7 +1038,7 @@ static int query_format(uint32_t format)
 		return 0;
 #ifdef CONFIG_VIDIX
 	if(vidix_name)
-		return (vidix_query_fourcc(format));
+		return vidix_query_fourcc(format);
 #endif
 	if ((format & IMGFMT_BGR_MASK) == IMGFMT_BGR) {
 		int bpp = format & 0xff;
@@ -1140,8 +1140,8 @@ static int preinit(const char *vo_subdevice)
 	    fb_dev_name = strdup(vo_subdevice);
 	}
     }
-    if(!pre_init_err) return (pre_init_err=(fb_preinit(0)?0:-1));
-    return(-1);
+    if(!pre_init_err) return pre_init_err = (fb_preinit(0) ? 0 : -1);
+    return -1;
 }
 
 static uint32_t get_image(mp_image_t *mpi)
@@ -1155,12 +1155,12 @@ static uint32_t get_image(mp_image_t *mpi)
 	(mpi->width != in_width) ||
 	(mpi->height != in_height)
        )
-    return(VO_FALSE);
+    return VO_FALSE;
 
     mpi->planes[0] = center;
     mpi->stride[0] = fb_line_len;
     mpi->flags |= MP_IMGFLAG_DIRECT;
-    return(VO_TRUE);
+    return VO_TRUE;
 }
 
 static int control(uint32_t request, void *data, ...)
diff --git a/libvo/vo_ggi.c b/libvo/vo_ggi.c
index ad28aeb05f..43d0567b28 100644
--- a/libvo/vo_ggi.c
+++ b/libvo/vo_ggi.c
@@ -141,17 +141,17 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 
     if (ggiSetMode(ggi_conf.vis, &mode) < 0) {
         mp_msg(MSGT_VO, MSGL_ERR, "[ggi] unable to set display mode\n");
-        return (-1);
+        return -1;
     }
     if (ggiGetMode(ggi_conf.vis, &mode) < 0) {
         mp_msg(MSGT_VO, MSGL_ERR, "[ggi] unable to get display mode\n");
-        return (-1);
+        return -1;
     }
     if ((mode.graphtype == GT_INVALID)
        || (mode.graphtype == GT_AUTO))
     {
         mp_msg(MSGT_VO, MSGL_ERR, "[ggi] not supported depth/bpp\n");
-        return (-1);
+        return -1;
     }
 
 #if 0
@@ -221,7 +221,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
     } else {
         mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] Unknown image format: %s\n",
                vo_format_name(ggi_conf.srcformat));
-        return (-1);
+        return -1;
     }
 
     mp_msg(MSGT_VO, MSGL_INFO, "[ggi] input: %dx%dx%d, output: %dx%dx%d\n",
@@ -235,7 +235,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
     ggi_conf.flushregion.x2 = vo_dwidth;
     ggi_conf.flushregion.y2 = vo_dheight;
 
-    return (0);
+    return 0;
 }
 
 static uint32_t get_image(mp_image_t *mpi)
@@ -244,19 +244,19 @@ static uint32_t get_image(mp_image_t *mpi)
     if (!((IMGFMT_IS_BGR(mpi->imgfmt)) &&
         (IMGFMT_BGR_DEPTH(mpi->imgfmt) == vo_dbpp)))
     {
-        return (VO_FALSE);
+        return VO_FALSE;
     }
 
     if (!((IMGFMT_IS_RGB(mpi->imgfmt)) &&
         (IMGFMT_RGB_DEPTH(mpi->imgfmt) == vo_dbpp)))
     {
-        return (VO_FALSE);
+        return VO_FALSE;
     }
 
     if (!((mpi->width == ggi_conf.srcwidth) &&
         (mpi->height == ggi_conf.srcheight)))
     {
-        return (VO_FALSE);
+        return VO_FALSE;
     }
 
     mpi->planes[1] = mpi->planes[2] = NULL;
@@ -272,7 +272,7 @@ static uint32_t get_image(mp_image_t *mpi)
     }
 #endif
 
-    return (VO_TRUE);
+    return VO_TRUE;
 }
 
 
@@ -286,7 +286,7 @@ static int draw_frame(uint8_t *src[])
     ggi_conf.flushregion.x2 = vo_dwidth;
     ggi_conf.flushregion.y2 = vo_dheight;
 
-    return (0);
+    return 0;
 }
 
 static void draw_osd(void)
@@ -346,7 +346,7 @@ static int draw_slice(uint8_t *src[], int stride[],
         ggi_conf.flushregion.y2 = vo_dy + y + h;
     }
 
-    return (1);
+    return 1;
 }
 
 static int query_format(uint32_t format)
@@ -386,19 +386,19 @@ static int query_format(uint32_t format)
             return vfcap;
         }
     }
-    return (0);
+    return 0;
 }
 
 static int preinit(const char *arg)
 {
     if (ggiInit() != 0) {
         mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize GGI\n");
-        return (-1);
+        return -1;
     }
 #ifdef HAVE_GGIWMH
     if (ggiWmhInit() < 0) {
         mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize libggiwmh\n");
-        return (-1);
+        return -1;
     }
 #endif
 
@@ -419,7 +419,7 @@ static int preinit(const char *arg)
         mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to open '%s' output\n",
                (ggi_conf.driver == NULL) ? "default" : ggi_conf.driver);
         ggiExit();
-        return (-1);
+        return -1;
     }
     ggi_conf.drawvis = ggi_conf.vis;
 
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 88210b1223..a9c9e186ee 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -915,8 +915,8 @@ static int preinit(const char *arg)
 static int control(uint32_t request, void *data, ...)
 {
   switch (request) {
-  case VOCTRL_PAUSE: return (int_pause=1);
-  case VOCTRL_RESUME: return (int_pause=0);
+  case VOCTRL_PAUSE: return int_pause = 1;
+  case VOCTRL_RESUME: return int_pause = 0;
   case VOCTRL_QUERY_FORMAT:
     return query_format(*((uint32_t*)data));
   case VOCTRL_GET_IMAGE:
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index aa198cd102..2d735c667b 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -870,8 +870,8 @@ static int preinit(const char *arg)
 static int control(uint32_t request, void *data, ...)
 {
   switch (request) {
-    case VOCTRL_PAUSE: return (int_pause=1);
-    case VOCTRL_RESUME: return (int_pause=0);
+    case VOCTRL_PAUSE: return int_pause = 1;
+    case VOCTRL_RESUME: return int_pause = 0;
     case VOCTRL_QUERY_FORMAT:
       return query_format(*((uint32_t*)data));
     case VOCTRL_GUISUPPORT:
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m
index 04d395ae56..1a01cf735a 100644
--- a/libvo/vo_macosx.m
+++ b/libvo/vo_macosx.m
@@ -363,8 +363,8 @@ static int control(uint32_t request, void *data, ...)
 {
 	switch (request)
 	{
-		case VOCTRL_PAUSE: return (int_pause=1);
-		case VOCTRL_RESUME: return (int_pause=0);
+		case VOCTRL_PAUSE: return int_pause = 1;
+		case VOCTRL_RESUME: return int_pause = 0;
 		case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data));
 		case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); if(!shared_buffer){ [mpGLView ontop]; } else { [mplayerosxProto ontop]; } return VO_TRUE;
 		case VOCTRL_ROOTWIN: vo_rootwin = (!(vo_rootwin)); [mpGLView rootwin]; return VO_TRUE;
diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c
index 240291bbf8..5b550df418 100644
--- a/libvo/vo_quartz.c
+++ b/libvo/vo_quartz.c
@@ -1236,8 +1236,8 @@ static int control(uint32_t request, void *data, ...)
 {
 	switch (request)
 	{
-		case VOCTRL_PAUSE: return (int_pause=1);
-		case VOCTRL_RESUME: return (int_pause=0);
+		case VOCTRL_PAUSE: return int_pause = 1;
+		case VOCTRL_RESUME: return int_pause = 0;
 		case VOCTRL_FULLSCREEN: vo_fs = (!(vo_fs)); window_fullscreen(); return VO_TRUE;
 		case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); window_ontop(); return VO_TRUE;
 		case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data));
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index e68dbf313e..0e2f770eca 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -574,7 +574,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 #endif    
 
   vga_setdisplaystart(0);
-  return (0);
+  return 0;
 }
 
 static int draw_slice(uint8_t *image[],int stride[],
@@ -723,7 +723,7 @@ int page;
 
   if(!IMGFMT_IS_BGR(mpi->imgfmt) && !IMGFMT_IS_RGB(mpi->imgfmt) ){ 
     assert(0);//should never happen
-    return(VO_FALSE);
+    return VO_FALSE;
   }
   
   if (
@@ -731,7 +731,7 @@ int page;
    (mpi->flags & MP_IMGFLAG_PLANAR) ||
    (mpi->flags & MP_IMGFLAG_YUV)
       )
-    return(VO_FALSE);
+    return VO_FALSE;
 
 //reading from video memory is horribly slow
   if( !(mpi->flags & MP_IMGFLAG_READABLE) && vo_directrendering &&
@@ -749,9 +749,9 @@ int page;
       mpi->priv=(void *)page;
       if( mp_msg_test(MSGT_VO,MSGL_DBG3) )
         mp_msg(MSGT_VO,MSGL_DBG3, "vo_svga: direct render allocated! page=%d\n",page);
-      return(VO_TRUE);
+      return VO_TRUE;
     }
   }
 
-  return(VO_FALSE);
+  return VO_FALSE;
 }
diff --git a/libvo/vo_tga.c b/libvo/vo_tga.c
index 0977f91074..63f7be2284 100644
--- a/libvo/vo_tga.c
+++ b/libvo/vo_tga.c
@@ -165,7 +165,7 @@ static int write_tga( char *file, int bpp, int dx, int dy, uint8_t *buf, int str
     if (er) {
         fprintf(stderr, "Error writing file [%s]\n", file);
     }
-    return(er);
+    return er;
 }
 
 static uint32_t draw_image(mp_image_t* mpi)
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c
index 0eaa47b07b..e9cad61248 100644
--- a/libvo/vo_vesa.c
+++ b/libvo/vo_vesa.c
@@ -460,7 +460,7 @@ static int query_format(uint32_t format)
     if( mp_msg_test(MSGT_VO,MSGL_DBG3) )
         mp_msg(MSGT_VO,MSGL_DBG3, "vo_vesa: query_format was called: %x (%s)\n",format,vo_format_name(format));
 #ifdef CONFIG_VIDIX
-    if(vidix_name)return(vidix_query_fourcc(format));
+    if(vidix_name) return vidix_query_fourcc(format);
 #endif
     if (format == IMGFMT_MPEGPES)
 	return 0;
diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c
index e47169678a..eb42f3d476 100644
--- a/libvo/vo_winvidix.c
+++ b/libvo/vo_winvidix.c
@@ -256,7 +256,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,uint32_t d_h
     ShowWindow(hWnd,SW_SHOW);
     if(vo_fs)ShowWindow(hWndFS,SW_SHOW);
     
-    return(0);
+    return 0;
 }
 
 static void check_events(void){
@@ -288,17 +288,17 @@ static int draw_slice(uint8_t *src[], int stride[],int w, int h, int x, int y){
     UNUSED(x);
     UNUSED(y);
     mp_msg(MSGT_VO, MSGL_FATAL, "[winvidix] error: didn't use vidix draw_slice!\n");
-    return(-1);
+    return -1;
 }
 
 static int draw_frame(uint8_t *src[]){
     UNUSED(src);
     mp_msg(MSGT_VO, MSGL_FATAL, "[winvidix] error: didn't use vidix draw_frame!\n");
-    return(-1);
+    return -1;
 }
 
 static int query_format(uint32_t format){
-  return(vidix_query_fourcc(format));
+  return vidix_query_fourcc(format);
 }
 
 static void uninit(void){
@@ -324,9 +324,9 @@ static int preinit(const char *arg){
     }
 
     if (vidix_preinit(vidix_name, &video_out_winvidix) != 0)
-	return(1);
+	return 1;
 
-    return(0);
+    return 0;
 }
 
 static int control(uint32_t request, void *data, ...){
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index ca79dab24f..78c66f9269 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -667,7 +667,7 @@ static uint32_t get_image(mp_image_t * mpi)
         || (mpi->flags & MP_IMGFLAG_PLANAR)
         || (mpi->flags & MP_IMGFLAG_YUV) || (mpi->width != image_width)
         || (mpi->height != image_height))
-        return (VO_FALSE);
+        return VO_FALSE;
 
     if (Flip_Flag)
     {
@@ -680,7 +680,7 @@ static uint32_t get_image(mp_image_t * mpi)
     }
     mpi->flags |= MP_IMGFLAG_DIRECT;
 
-    return (VO_TRUE);
+    return VO_TRUE;
 }
 
 static int query_format(uint32_t format)
@@ -753,9 +753,9 @@ static int control(uint32_t request, void *data, ...)
     switch (request)
     {
         case VOCTRL_PAUSE:
-            return (int_pause = 1);
+            return int_pause = 1;
         case VOCTRL_RESUME:
-            return (int_pause = 0);
+            return int_pause = 0;
         case VOCTRL_QUERY_FORMAT:
             return query_format(*((uint32_t *) data));
         case VOCTRL_GUISUPPORT:
diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c
index 46f8f83fcf..98566689d6 100644
--- a/libvo/vo_xover.c
+++ b/libvo/vo_xover.c
@@ -332,7 +332,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 
   panscan_calc();
 
-  return(0);
+  return 0;
 }
 
 static void check_events(void)
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index aaa9332a43..16f0b2d806 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -852,9 +852,9 @@ static int control(uint32_t request, void *data, ...)
     switch (request)
     {
         case VOCTRL_PAUSE:
-            return (int_pause = 1);
+            return int_pause = 1;
         case VOCTRL_RESUME:
-            return (int_pause = 0);
+            return int_pause = 0;
         case VOCTRL_QUERY_FORMAT:
             return query_format(*((uint32_t *) data));
         case VOCTRL_GET_IMAGE:
@@ -902,7 +902,7 @@ static int control(uint32_t request, void *data, ...)
 
                 va_end(ap);
 
-                return (vo_xv_set_eq(xv_port, data, value));
+                return vo_xv_set_eq(xv_port, data, value);
             }
         case VOCTRL_GET_EQUALIZER:
             {
@@ -914,7 +914,7 @@ static int control(uint32_t request, void *data, ...)
 
                 va_end(ap);
 
-                return (vo_xv_get_eq(xv_port, data, value));
+                return vo_xv_get_eq(xv_port, data, value);
             }
         case VOCTRL_ONTOP:
             vo_x11_ontop();
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index 7a455dd695..f330eb9521 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -378,7 +378,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
     if (vo_ontop)
         vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
 
-    return (0);
+    return 0;
 }
 
 static void check_events(void)
@@ -418,7 +418,7 @@ static int draw_slice(uint8_t * src[], int stride[],
     UNUSED(y);
     mp_msg(MSGT_VO, MSGL_FATAL,
            "[xvidix] error: didn't used vidix draw_slice!\n");
-    return (-1);
+    return -1;
 }
 
 static int draw_frame(uint8_t * src[])
@@ -426,12 +426,12 @@ static int draw_frame(uint8_t * src[])
     UNUSED(src);
     mp_msg(MSGT_VO, MSGL_FATAL,
            "[xvidix] error: didn't used vidix draw_frame!\n");
-    return (-1);
+    return -1;
 }
 
 static int query_format(uint32_t format)
 {
-    return (vidix_query_fourcc(format));
+    return vidix_query_fourcc(format);
 }
 
 static void uninit(void)
@@ -462,12 +462,12 @@ static int preinit(const char *arg)
     }
 
     if (!vo_init())
-        return (-1);
+        return -1;
 
     if (vidix_preinit(vidix_name, &video_out_xvidix) != 0)
-        return (1);
+        return 1;
 
-    return (0);
+    return 0;
 }
 
 static int control(uint32_t request, void *data, ...)
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index 8fb227eb55..1471f5956a 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -1410,7 +1410,7 @@ static int control(uint32_t request, void *data, ... )
          value = va_arg(ap, int);
          va_end(ap);
 
-         return(vo_xv_set_eq(xv_port, data, value));
+         return vo_xv_set_eq(xv_port, data, value);
       }
 
       case VOCTRL_GET_EQUALIZER:
@@ -1422,7 +1422,7 @@ static int control(uint32_t request, void *data, ... )
          value = va_arg(ap, int*);
          va_end(ap);
 
-         return(vo_xv_get_eq(xv_port, data, value));
+         return vo_xv_get_eq(xv_port, data, value);
       }
       case VOCTRL_UPDATE_SCREENINFO:
          update_xinerama_info();
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c
index 0357fe3c44..615199e66a 100644
--- a/libvo/vosub_vidix.c
+++ b/libvo/vosub_vidix.c
@@ -318,17 +318,17 @@ uint32_t vidix_query_fourcc(uint32_t format)
 
 int vidix_grkey_support(void)
 {
-    return(vidix_fourcc.flags & VID_CAP_COLORKEY);
+    return vidix_fourcc.flags & VID_CAP_COLORKEY;
 }
 
 int vidix_grkey_get(vidix_grkey_t *gr_key)
 {
-    return(vdlGetGrKeys(vidix_handler, gr_key));
+    return vdlGetGrKeys(vidix_handler, gr_key);
 }
 
 int vidix_grkey_set(const vidix_grkey_t *gr_key)
 {
-    return(vdlSetGrKeys(vidix_handler, gr_key));
+    return vdlSetGrKeys(vidix_handler, gr_key);
 }
 
 
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 2ed8ff31c6..d2d58b5c12 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -279,11 +279,11 @@ static int x11_get_property(Atom type, Atom ** args, unsigned long *nitems)
     int format;
     unsigned long bytesafter;
 
-    return (Success ==
+    return  Success ==
             XGetWindowProperty(mDisplay, mRootWin, type, 0, 16384, False,
                                AnyPropertyType, &type, &format, nitems,
                                &bytesafter, (unsigned char **) args)
-            && *nitems > 0);
+            && *nitems > 0;
 }
 
 static int vo_wm_detect(void)
@@ -2102,10 +2102,10 @@ int vo_xv_set_eq(uint32_t xv_port, char *name, int value)
                     (port_value + 100) * (port_max - port_min) / 200 +
                     port_min;
                 XvSetPortAttribute(mDisplay, xv_port, xv_atom, port_value);
-                return (VO_TRUE);
+                return VO_TRUE;
             }
         }
-    return (VO_FALSE);
+    return VO_FALSE;
 }
 
 int vo_xv_get_eq(uint32_t xv_port, char *name, int *value)
@@ -2168,10 +2168,10 @@ int vo_xv_get_eq(uint32_t xv_port, char *name, int *value)
 
                 mp_dbg(MSGT_VO, MSGL_V, "xv_get_eq called! (%s, %d)\n",
                        name, *value);
-                return (VO_TRUE);
+                return VO_TRUE;
             }
         }
-    return (VO_FALSE);
+    return VO_FALSE;
 }
 
 /** \brief contains flags changing the execution of the colorkeying code */