[MPlayer-cvslog] r29479 - trunk/libmpcodecs/vf_expand.c

[ben]

Author: ben
Date: Thu Aug  6 22:04:19 2009
New Revision: 29479

Log:
Replace macro: MAX -> FFMAX

Modified:
   trunk/libmpcodecs/vf_expand.c

Modified: trunk/libmpcodecs/vf_expand.c
==============================================================================
--- trunk/libmpcodecs/vf_expand.c	Thu Aug  6 11:43:10 2009	(r29478)
+++ trunk/libmpcodecs/vf_expand.c	Thu Aug  6 22:04:19 2009	(r29479)
@@ -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 @@ static void get_image(struct vf_instance
 	// 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 @@ static void start_slice(struct vf_instan
 	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;