[MPlayer-cvslog] r34840 - trunk/libvo/vo_directx.c

[reimar]

Author: reimar
Date: Wed Apr  4 21:12:16 2012
New Revision: 34840

Log:
vo_directx: do not do aspect scaling in windowed mode.
This matches behaviour of other vos.

Modified:
   trunk/libvo/vo_directx.c

Modified: trunk/libvo/vo_directx.c
==============================================================================
--- trunk/libvo/vo_directx.c	Wed Apr  4 20:45:37 2012	(r34839)
+++ trunk/libvo/vo_directx.c	Wed Apr  4 21:12:16 2012	(r34840)
@@ -464,10 +464,12 @@ static uint32_t Directx_ManageDisplay(vo
     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;