do not modify d_width and d_height when -xy option was given, otherwise -xy has no effect with e.g. vo_gl

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13269 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2004-09-06 21:26:46 +00:00
parent 49a7110b03
commit 2fa8fe4ad3
1 changed files with 2 additions and 1 deletions

View File

@ -40,6 +40,7 @@ static struct vf_priv_s {
extern int opt_screen_size_x;
extern int opt_screen_size_y;
extern float screen_size_xy;
//===========================================================================//
@ -232,7 +233,7 @@ static int config(struct vf_instance_s* vf,
break; }
}
if(!opt_screen_size_x && !opt_screen_size_y){
if(!opt_screen_size_x && !opt_screen_size_y && !(screen_size_xy >= 0.001)){
// Compute new d_width and d_height, preserving aspect
// while ensuring that both are >= output size in pixels.
if (vf->priv->h * d_width > vf->priv->w * d_height) {