[Mplayer-cvslog] CVS: main/libmpcodecs vf_scale.c,1.53,1.54

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv6222/libmpcodecs

Modified Files:
	vf_scale.c 
Log Message:
do not modify d_width and d_height when -xy option was given, otherwise -xy has no effect with e.g. vo_gl


Index: vf_scale.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_scale.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- vf_scale.c	14 May 2004 21:08:53 -0000	1.53
+++ vf_scale.c	6 Sep 2004 21:26:46 -0000	1.54
@@ -40,6 +40,7 @@
 
 extern int opt_screen_size_x;
 extern int opt_screen_size_y;
+extern float screen_size_xy;
 
 //===========================================================================//
 
@@ -232,7 +233,7 @@
 	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) {