1 diff -urN MPlayer-1.0pre8.orig/libmpcodecs/vf_expand.c MPlayer-1.0pre8/libmpcodecs/vf_expand.c
2 --- MPlayer-1.0pre8.orig/libmpcodecs/vf_expand.c 2006-06-11 20:35:41.000000000 +0200
3 +++ MPlayer-1.0pre8/libmpcodecs/vf_expand.c 2006-06-28 20:28:03.241518750 +0200
5 if(vf->priv->exp_h<height) vf->priv->exp_h=height;
7 if ( vf->priv->exp_w == -1 ) vf->priv->exp_w=width;
8 - else if (vf->priv->exp_w < -1 ) vf->priv->exp_w=width - vf->priv->exp_w;
9 + else if ( vf->priv->exp_w == -2 ) vf->priv->exp_w=FFMAX(width, height*4.0/3);
10 + else if ( vf->priv->exp_w == -3 ) vf->priv->exp_w=FFMAX(width, height*16.0/9);
11 + else if (vf->priv->exp_w < -3 ) vf->priv->exp_w=width - vf->priv->exp_w;
12 else if ( vf->priv->exp_w<width ) vf->priv->exp_w=width;
13 if ( vf->priv->exp_h == -1 ) vf->priv->exp_h=height;
14 - else if ( vf->priv->exp_h < -1 ) vf->priv->exp_h=height - vf->priv->exp_h;
15 + else if ( vf->priv->exp_h == -2 ) vf->priv->exp_h=FFMAX(height, width*3.0/4);
16 + else if ( vf->priv->exp_h == -3 ) vf->priv->exp_h=FFMAX(height, width*9.0/16);
17 + else if ( vf->priv->exp_h < -3 ) vf->priv->exp_h=height - vf->priv->exp_h;
18 else if( vf->priv->exp_h<height ) vf->priv->exp_h=height;
20 if (vf->priv->aspect) {