Mercurial > mplayer.hg

changeset 34752:ad2b851c3f19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vo_directx: do not do aspect scaling in windowed mode. This matches behaviour of other vos.
author reimar
date Wed, 04 Apr 2012 19:12:16 +0000
parents 97b5fb86090e
children 00ebd36202c6
files libvo/vo_directx.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;