summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2012-04-04 19:12:16 +0000
committerwm4 <wm4@mplayer2.org>2012-04-06 23:56:31 +0200
commit1020ae516ba5577c0fc356acad58e12a9ba56c65 (patch)
tree1f756d17a2317f94afd2d3a7ce1d2b4a55dd5d27
parenta659429f865859d66f7fe27e45cb20cb897546ec (diff)
downloadmpv-1020ae516ba5577c0fc356acad58e12a9ba56c65.tar.bz2
mpv-1020ae516ba5577c0fc356acad58e12a9ba56c65.tar.xz
vo_directx: do not do aspect scaling in windowed mode.
This matches behaviour of other vos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34840 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/vo_directx.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index 52d18188d2..f4ab2a7f7f 100644
--- a/libvo/vo_directx.c
+++ b/libvo/vo_directx.c
@@ -466,10 +466,12 @@ static uint32_t Directx_ManageDisplay(void)
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;
+ }
rd.left += (vo_dwidth - width ) / 2;
rd.top += (vo_dheight - height) / 2;