# HG changeset patch
# User rfelker
# Date 1130081110 0
# Node ID 098d3c815fe2a4c03c81873d14df288956e17d50
# Parent  a5ff3d90f16d0129217b4969b20d1fe1ca7fe29c
10l to whoever got aspect upside-down.. it's w/h, not h/w. hope this doesn't bother anyone already using it too much

diff -r a5ff3d90f16d -r 098d3c815fe2 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Sun Oct 23 15:05:11 2005 +0000
+++ b/DOCS/man/en/mplayer.1	Sun Oct 23 15:25:10 2005 +0000
@@ -4431,9 +4431,9 @@
 .I EXAMPLE:
 .PD 0
 .RSs
-.IP expand=800::::3/4
+.IP expand=800::::4/3
 Expands to 800x600, unless the source is higher resolution, in which
-case it expands to fill a 3/4 aspect.
+case it expands to fill a 4/3 aspect.
 .RE
 .PD 1
 .IPs <r>\ \ 
diff -r a5ff3d90f16d -r 098d3c815fe2 libmpcodecs/vf_expand.c
--- a/libmpcodecs/vf_expand.c	Sun Oct 23 15:05:11 2005 +0000
+++ b/libmpcodecs/vf_expand.c	Sun Oct 23 15:25:10 2005 +0000
@@ -183,10 +183,10 @@
         else if( vf->priv->exp_h<height ) vf->priv->exp_h=height;
 #endif
     if (vf->priv->aspect) {
-        if (vf->priv->exp_h < vf->priv->exp_w * vf->priv->aspect) {
-            vf->priv->exp_h = vf->priv->exp_w * vf->priv->aspect;
+        if (vf->priv->exp_h < vf->priv->exp_w / vf->priv->aspect) {
+            vf->priv->exp_h = vf->priv->exp_w / vf->priv->aspect;
         } else {
-            vf->priv->exp_w = vf->priv->exp_h / vf->priv->aspect;
+            vf->priv->exp_w = vf->priv->exp_h * vf->priv->aspect;
         }
     }
     if (vf->priv->round > 1) { // round up.