# HG changeset patch
# User reimar
# Date 1333566736 0
# Node ID ad2b851c3f1971eb1ea7edcb8d549b176b35b3a1
# Parent  97b5fb86090e5963638f3ad9ded03ff35b287ebe
vo_directx: do not do aspect scaling in windowed mode.
This matches behaviour of other vos.

diff -r 97b5fb86090e -r ad2b851c3f19 libvo/vo_directx.c
--- a/libvo/vo_directx.c	Wed Apr 04 18:45:37 2012 +0000
+++ b/libvo/vo_directx.c	Wed Apr 04 19:12:16 2012 +0000
@@ -464,10 +464,12 @@
     width   = vo_dwidth;
     height  = vo_dheight;
 
-    aspect(&width, &height, A_WINZOOM);
-    panscan_calc_windowed();
-    width   += vo_panscan_x;
-    height  += vo_panscan_y;
+    if (aspect_scaling()) {
+        aspect(&width, &height, A_WINZOOM);
+        panscan_calc_windowed();
+        width   += vo_panscan_x;
+        height  += vo_panscan_y;
+    }
     width    = FFMIN(width, vo_screenwidth);
     height   = FFMIN(height, vo_screenheight);
     rd.left += (vo_dwidth - width) / 2;