summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-12-03 10:38:50 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-12-03 10:38:50 +0000
commitc4386a8333c19e28005d7a47aa2a34c60e139912 (patch)
tree1e91ee11e606265d8a442473309b5b816309e3e1 /libvo
parent9d580f6aa33f5c3bee0fc7fd551e53557be12879 (diff)
downloadmpv-c4386a8333c19e28005d7a47aa2a34c60e139912.tar.bz2
mpv-c4386a8333c19e28005d7a47aa2a34c60e139912.tar.xz
Do not override the vo_dwidth/vo_dheight values in vo_w32_config
in -wid mode because we ignore the requested size in that case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28072 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/w32_common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libvo/w32_common.c b/libvo/w32_common.c
index 9062f6898d..7674ba894b 100644
--- a/libvo/w32_common.c
+++ b/libvo/w32_common.c
@@ -380,10 +380,13 @@ int vo_w32_config(uint32_t width, uint32_t height, uint32_t flags) {
o_dwidth = width;
o_dheight = height;
+ if (WinID < 0) {
+ // the desired size is ignored in wid mode, it always matches the window size.
prev_width = vo_dwidth = width;
prev_height = vo_dheight = height;
prev_x = vo_dx;
prev_y = vo_dy;
+ }
vo_fs = flags & VOFLAG_FULLSCREEN;
vo_vm = flags & VOFLAG_MODESWITCHING;