Mercurial > mplayer.hg

changeset 29352:1f7497265ab6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fbdev: remove pointless ()
author reimar
date Fri, 26 Jun 2009 14:40:31 +0000
parents d58878f243ea
children 22db6af09a1d
files libvo/vo_fbdev.c
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_fbdev.c	Fri Jun 26 13:54:22 2009 +0000
+++ b/libvo/vo_fbdev.c	Fri Jun 26 14:40:31 2009 +0000
@@ -610,8 +610,8 @@
     bcols = 1 << var->blue.length;
 
     /* Make our palette the length of the deepest color */
-    cols = (rcols > gcols ? rcols : gcols);
-    cols = (cols  > bcols ? cols  : bcols);
+    cols = rcols > gcols ? rcols : gcols;
+    cols = cols  > bcols ? cols  : bcols;
 
     red = malloc(cols * sizeof(red[0]));
     if (!red) {
@@ -763,7 +763,7 @@
         mp_msg(MSGT_VO, MSGL_ERR, "-fbmode can only be used with -vm\n");
         return 1;
     }
-    if (vm && (parse_fbmode_cfg(fb_mode_cfgfile) < 0))
+    if (vm && parse_fbmode_cfg(fb_mode_cfgfile) < 0)
         return 1;
     if (d_width && (fs || vm)) {
         out_width  = d_width;
@@ -1095,19 +1095,19 @@
         }
     }
     if (!pre_init_err)
-        return pre_init_err = (fb_preinit(0) ? 0 : -1);
+        return pre_init_err = fb_preinit(0) ? 0 : -1;
     return -1;
 }
 
 static uint32_t get_image(mp_image_t *mpi)
 {
     if (!IMGFMT_IS_BGR(mpi->imgfmt) ||
-        (IMGFMT_BGR_DEPTH(mpi->imgfmt) != fb_bpp) ||
-        ((mpi->type != MP_IMGTYPE_STATIC) && (mpi->type != MP_IMGTYPE_TEMP)) ||
+        IMGFMT_BGR_DEPTH(mpi->imgfmt) != fb_bpp ||
+        (mpi->type != MP_IMGTYPE_STATIC && mpi->type != MP_IMGTYPE_TEMP) ||
         (mpi->flags & MP_IMGFLAG_PLANAR) ||
         (mpi->flags & MP_IMGFLAG_YUV) ||
-        (mpi->width != in_width) ||
-        (mpi->height != in_height)
+        mpi->width != in_width ||
+        mpi->height != in_height
        )
         return VO_FALSE;
 
@@ -1123,7 +1123,7 @@
     case VOCTRL_GET_IMAGE:
         return get_image(data);
     case VOCTRL_QUERY_FORMAT:
-        return query_format(*((uint32_t*)data));
+        return query_format(*(uint32_t*)data);
     }
 
 #ifdef CONFIG_VIDIX