Mercurial > mplayer.hg

changeset 33213:d7b577e7e644

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify by using FFMAX3.
author reimar
date Fri, 22 Apr 2011 16:43:14 +0000
parents c52a2600de15
children 4de1d029ab8f
files libvo/vo_fbdev2.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_fbdev2.c	Fri Apr 22 12:33:08 2011 +0000
+++ b/libvo/vo_fbdev2.c	Fri Apr 22 16:43:14 2011 +0000
@@ -122,8 +122,7 @@
   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) {