Mercurial > mplayer.hg

changeset 29893:5eef60a98c6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use FFMAX instead of a custom max macro.
author reimar
date Fri, 20 Nov 2009 10:22:57 +0000
parents ecf6cbab0b8d
children 4c4552f547b3
files subreader.c
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/subreader.c	Wed Nov 18 18:24:05 2009 +0000
+++ b/subreader.c	Fri Nov 20 10:22:57 2009 +0000
@@ -19,6 +19,7 @@
 #include "mp_msg.h"
 #include "subreader.h"
 #include "stream/stream.h"
+#include "libavutil/common.h"
 
 #ifdef CONFIG_ENCA
 #include <enca.h>
@@ -1147,9 +1148,6 @@
 #endif
 
 #ifdef CONFIG_FRIBIDI
-#ifndef max
-#define max(a,b)  (((a)>(b))?(a):(b))
-#endif
 subtitle* sub_fribidi (subtitle *sub, int sub_utf8)
 {
   FriBidiChar logical[LINE_LEN+1], visual[LINE_LEN+1]; // Hopefully these two won't smash the stack
@@ -1184,7 +1182,7 @@
     if(log2vis) {
       len = fribidi_remove_bidi_marks (visual, len, NULL, NULL,
 				       NULL);
-      if((op = malloc((max(2*orig_len,2*len) + 1))) == NULL) {
+      if((op = malloc((FFMAX(2*orig_len,2*len) + 1))) == NULL) {
 	mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error allocating mem.\n");
 	l++;
 	break;