RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Use FFMAX instead of a custom max macro. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29935 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-11-20 10:22:57 +00:00
parent c038d74c9b
commit 6712791ad6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
subreader.c
View File

@ -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 @@ subtitle* subcp_recode (subtitle *sub)
#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 @@ subtitle* sub_fribidi (subtitle *sub, int sub_utf8)
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;