summaryrefslogtreecommitdiffstats
path: root/libmenu
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-05-07 16:51:53 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-05-07 16:51:53 +0000
commita2e997c1555cfddd7db1848249786faa43804764 (patch)
treea4e6252b84adcdef06547ddda4221144771aef7c /libmenu
parenta797b105f37f43d1c2611417199ba26653b808a9 (diff)
downloadmpv-a2e997c1555cfddd7db1848249786faa43804764.tar.bz2
mpv-a2e997c1555cfddd7db1848249786faa43804764.tar.xz
used FFMAX macro as pointed out by reimar
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23249 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmenu')
-rw-r--r--libmenu/menu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmenu/menu.c b/libmenu/menu.c
index ae3889ccab..e751dbd6a6 100644
--- a/libmenu/menu.c
+++ b/libmenu/menu.c
@@ -328,6 +328,7 @@ static void render_txt(char *txt)
#ifdef USE_FRIBIDI
#include <fribidi/fribidi.h>
+#include "libavutil/common.h"
static char *menu_fribidi_charset = NULL;
static int menu_flip_hebrew = 0;
static int menu_fribidi_flip_commas = 0;
@@ -353,7 +354,7 @@ static char *menu_fribidi(char *txt)
} else {
char_set_num = fribidi_parse_charset("UTF-8");
}
- buffer_size = 1024 > (len+1) ? 1024 : (len+1);
+ buffer_size = FFMAX(1024,len+1);
logical = malloc(buffer_size);
visual = malloc(buffer_size);
outputstr = malloc(buffer_size);