Mercurial > mplayer.hg

changeset 5921:20ccb89222bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
expand=-1:-50:0:0 -> mwidth:mheight+50:0:0
author pontscho
date Wed, 01 May 2002 14:15:05 +0000
parents 79f5f072348b
children 30eea1bd1b64
files libmpcodecs/vf_expand.c
diffstat 1 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vf_expand.c	Wed May 01 14:12:32 2002 +0000
+++ b/libmpcodecs/vf_expand.c	Wed May 01 14:15:05 2002 +0000
@@ -145,8 +145,17 @@
 	unsigned int flags, unsigned int outfmt){
     int ret;
     // calculate the missing parameters:
+#if 0
     if(vf->priv->exp_w<width) vf->priv->exp_w=width;
     if(vf->priv->exp_h<height) vf->priv->exp_h=height;
+#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<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<height ) vf->priv->exp_h=height;
+#endif
     if(vf->priv->exp_x<0 || vf->priv->exp_x+width>vf->priv->exp_w) vf->priv->exp_x=(vf->priv->exp_w-width)/2;
     if(vf->priv->exp_y<0 || vf->priv->exp_y+height>vf->priv->exp_h) vf->priv->exp_y=(vf->priv->exp_h-height)/2;
     vf->priv->fb_ptr=NULL;