Do not modify parsed command-line values on config,

use a local variable instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20577 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-11-01 10:52:23 +00:00
parent f3dec715cd
commit ad95e7a79a
1 changed files with 5 additions and 4 deletions

View File

@ -184,11 +184,12 @@ static int config(struct vf_instance_s* vf,
else if( vf->priv->exp_h<height ) vf->priv->exp_h=height;
#endif
if (vf->priv->aspect) {
vf->priv->aspect *= ((double)width/height) / ((double)d_width/d_height);
if (vf->priv->exp_h < vf->priv->exp_w / vf->priv->aspect) {
vf->priv->exp_h = vf->priv->exp_w / vf->priv->aspect + 0.5;
float adjusted_aspect = vf->priv->aspect;
adjusted_aspect *= ((double)width/height) / ((double)d_width/d_height);
if (vf->priv->exp_h < vf->priv->exp_w / adjusted_aspect) {
vf->priv->exp_h = vf->priv->exp_w / adjusted_aspect + 0.5;
} else {
vf->priv->exp_w = vf->priv->exp_h * vf->priv->aspect + 0.5;
vf->priv->exp_w = vf->priv->exp_h * adjusted_aspect + 0.5;
}
}
if (vf->priv->round > 1) { // round up.