Mercurial > mplayer.hg

changeset 13268:125f1b58a325

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not modify d_width and d_height when -xy option was given, otherwise -xy has no effect with e.g. vo_gl
author reimar
date Mon, 06 Sep 2004 21:26:46 +0000
parents 8d4a16cb1e97
children aa13937da8a0
files libmpcodecs/vf_scale.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vf_scale.c	Mon Sep 06 21:25:59 2004 +0000
+++ b/libmpcodecs/vf_scale.c	Mon Sep 06 21:26:46 2004 +0000
@@ -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) {