RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Put back the ordering of the if as requested by Arpi. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6751 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
kmkaplan 2002-07-18 16:14:27 +00:00
parent 5bafd479ae
commit 1909c80216
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmpcodecs/vf_scale.c
View File

@ -107,24 +107,28 @@ static int config(struct vf_instance_s* vf,
case IMGFMT_YUY2: /* YUY2 needs w rounded to 2 */
if(vf->priv->w==-3) vf->priv->w=(vf->priv->h*width/height+1)&~1; else
if(vf->priv->w==-2) vf->priv->w=(vf->priv->h*d_width/d_height+1)&~1;
if(vf->priv->w<0) vf->priv->w=width; else
if(vf->priv->w==0) vf->priv->w=d_width;
if(vf->priv->h==-3) vf->priv->h=vf->priv->w*height/width; else
if(vf->priv->h==-2) vf->priv->h=vf->priv->w*d_height/d_width;
break;
case IMGFMT_YV12: /* YV12 needs w & h rounded to 2 */
if(vf->priv->w==-3) vf->priv->w=(vf->priv->h*width/height+1)&~1; else
if(vf->priv->w==-2) vf->priv->w=(vf->priv->h*d_width/d_height+1)&~1;
if(vf->priv->w<0) vf->priv->w=width; else
if(vf->priv->w==0) vf->priv->w=d_width;
if(vf->priv->h==-3) vf->priv->h=(vf->priv->w*height/width+1)&~1; else
if(vf->priv->h==-2) vf->priv->h=(vf->priv->w*d_height/d_width+2)&~1;
break;
default:
if(vf->priv->w==-3) vf->priv->w=vf->priv->h*width/height; else
if(vf->priv->w==-2) vf->priv->w=vf->priv->h*d_width/d_height;
if(vf->priv->w<0) vf->priv->w=width; else
if(vf->priv->w==0) vf->priv->w=d_width;
if(vf->priv->h==-3) vf->priv->h=vf->priv->w*height/width; else
if(vf->priv->h==-2) vf->priv->h=vf->priv->w*d_height/d_width;
break;
}
if(vf->priv->w<0) vf->priv->w=width; else
if(vf->priv->w==0) vf->priv->w=d_width;
if(vf->priv->h<0) vf->priv->h=height; else
if(vf->priv->h==0) vf->priv->h=d_height;