summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-06-26 14:40:31 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-06-26 14:40:31 +0000
commit2b19b2dcbae11860e7723bf0447e2da67ea68c4f (patch)
tree9d6f8d70eb53d92707fa0a4a3125ca4a52d8ffc6
parent437efdc855d2ccf83d482f40a90041609e7ac373 (diff)
downloadmpv-2b19b2dcbae11860e7723bf0447e2da67ea68c4f.tar.bz2
mpv-2b19b2dcbae11860e7723bf0447e2da67ea68c4f.tar.xz
fbdev: remove pointless ()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29394 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/vo_fbdev.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c
index 5f621967cf..6c40e3840f 100644
--- a/libvo/vo_fbdev.c
+++ b/libvo/vo_fbdev.c
@@ -610,8 +610,8 @@ static struct fb_cmap *make_directcolor_cmap(struct fb_var_screeninfo *var)
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 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
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 @@ static int preinit(const char *vo_subdevice)
}
}
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 @@ static int control(uint32_t request, void *data, ...)
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