# HG changeset patch
# User ben
# Date 1249589059 0
# Node ID d401b1eefcad9127a9178fbe8481af337a805e51
# Parent  4537ed655f0b9453c93e5d99f8ac4a3f35fa259b
Replace macro: MAX -> FFMAX

diff -r 4537ed655f0b -r d401b1eefcad libmpcodecs/vf_expand.c
--- a/libmpcodecs/vf_expand.c	Thu Aug 06 09:43:10 2009 +0000
+++ b/libmpcodecs/vf_expand.c	Thu Aug 06 20:04:19 2009 +0000
@@ -13,6 +13,7 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
+#include "libavutil/avutil.h"
 
 #ifdef OSD_SUPPORT
 #include "libvo/sub.h"
@@ -22,8 +23,6 @@
 #include "m_option.h"
 #include "m_struct.h"
 
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-
 static struct vf_priv_s {
     int exp_w,exp_h;
     int exp_x,exp_y;
@@ -253,8 +252,8 @@
 	// try full DR !
 	mpi->priv=vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
 	    mpi->type, mpi->flags,
-            MAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x),
-            MAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y));
+            FFMAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x),
+            FFMAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y));
 #if 1
 	if((vf->dmpi->flags & MP_IMGFLAG_DRAW_CALLBACK) &&
 	  !(vf->dmpi->flags & MP_IMGFLAG_DIRECT)){
@@ -296,8 +295,8 @@
 	mpi->priv=vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
 //	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
 	    MP_IMGTYPE_TEMP, mpi->flags,
-            MAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x),
-            MAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y));
+            FFMAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x),
+            FFMAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y));
     if(!(vf->dmpi->flags&MP_IMGFLAG_DRAW_CALLBACK))
 	mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices); // shouldn't happen.
     vf->priv->first_slice = 1;