packages: mplayer/mplayer-auto-expand.patch - MAX macro renamed to FFMAX

[sparky]

Author: sparky                       Date: Wed Nov 18 22:19:13 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- MAX macro renamed to FFMAX

---- Files affected:
packages/mplayer:
   mplayer-auto-expand.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/mplayer/mplayer-auto-expand.patch
diff -u packages/mplayer/mplayer-auto-expand.patch:1.1 packages/mplayer/mplayer-auto-expand.patch:1.2
--- packages/mplayer/mplayer-auto-expand.patch:1.1	Wed Jun 28 20:51:25 2006
+++ packages/mplayer/mplayer-auto-expand.patch	Wed Nov 18 23:19:08 2009
@@ -6,14 +6,14 @@
  #else
      if ( vf->priv->exp_w == -1 ) vf->priv->exp_w=width;
 -      else if (vf->priv->exp_w < -1 ) vf->priv->exp_w=width - vf->priv->exp_w;
-+    else if ( vf->priv->exp_w == -2 ) vf->priv->exp_w=MAX(width, height*4.0/3);
-+    else if ( vf->priv->exp_w == -3 ) vf->priv->exp_w=MAX(width, height*16.0/9);
++    else if ( vf->priv->exp_w == -2 ) vf->priv->exp_w=FFMAX(width, height*4.0/3);
++    else if ( vf->priv->exp_w == -3 ) vf->priv->exp_w=FFMAX(width, height*16.0/9);
 +      else if (vf->priv->exp_w < -3 ) vf->priv->exp_w=width - vf->priv->exp_w;
          else if ( vf->priv->exp_w<width ) vf->priv->exp_w=width;
      if ( vf->priv->exp_h == -1 ) vf->priv->exp_h=height;
 -      else if ( vf->priv->exp_h < -1 ) vf->priv->exp_h=height - vf->priv->exp_h;
-+    else if ( vf->priv->exp_h == -2 ) vf->priv->exp_h=MAX(height, width*3.0/4);
-+    else if ( vf->priv->exp_h == -3 ) vf->priv->exp_h=MAX(height, width*9.0/16);
++    else if ( vf->priv->exp_h == -2 ) vf->priv->exp_h=FFMAX(height, width*3.0/4);
++    else if ( vf->priv->exp_h == -3 ) vf->priv->exp_h=FFMAX(height, width*9.0/16);
 +      else if ( vf->priv->exp_h < -3 ) vf->priv->exp_h=height - vf->priv->exp_h;
          else if( vf->priv->exp_h<height ) vf->priv->exp_h=height;
  #endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer-auto-expand.patch?r1=1.1&r2=1.2&f=u