[MPlayer-cvslog] r33300 - trunk/libvo/vo_fbdev2.c

[reimar]

Author: reimar
Date: Fri Apr 22 18:43:14 2011
New Revision: 33300

Log:
Simplify by using FFMAX3.

Modified:
   trunk/libvo/vo_fbdev2.c

Modified: trunk/libvo/vo_fbdev2.c
==============================================================================
--- trunk/libvo/vo_fbdev2.c	Fri Apr 22 14:33:08 2011	(r33299)
+++ trunk/libvo/vo_fbdev2.c	Fri Apr 22 18:43:14 2011	(r33300)
@@ -122,8 +122,7 @@ static struct fb_cmap *make_directcolor_
   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 = FFMAX3(rcols, gcols, bcols);
 
   red = malloc(cols * sizeof(red[0]));
   if(!red) {