diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-27 13:54:53 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-27 13:54:53 +0000 |
commit | 082c7b9446ab04ac1f6974c720243becefc771e4 (patch) | |
tree | 4b4bf7aa90e3e676daa672157b309de75f9f4ac8 /libvo | |
parent | 6ec672e3cc75c1a4a29f945cbacd4ca6a13ca2ac (diff) | |
download | mpv-082c7b9446ab04ac1f6974c720243becefc771e4.tar.bz2 mpv-082c7b9446ab04ac1f6974c720243becefc771e4.tar.xz |
Simplify and fix ass border calculations for -vo gl and -wid -fs mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29561 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/vo_gl.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 4a5f70c3b9..8a080bdfb0 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -173,8 +173,8 @@ static void resize(int x,int y){ scale_x = (GLdouble)new_w / (GLdouble)x; scale_y = (GLdouble)new_h / (GLdouble)y; glScaled(scale_x, scale_y, 1); - ass_border_x = (vo_screenwidth - new_w) / 2; - ass_border_y = (vo_screenheight - new_h) / 2; + ass_border_x = (vo_dwidth - new_w) / 2; + ass_border_y = (vo_dheight - new_h) / 2; } glOrtho(0, image_width, image_height, 0, -1,1); @@ -1148,10 +1148,7 @@ static int control(uint32_t request, void *data, ...) r->mt = r->mb = r->ml = r->mr = 0; if (scaled_osd) {r->w = image_width; r->h = image_height;} else if (vo_fs) { - r->w = vo_screenwidth; r->h = vo_screenheight; - if (WinID >= 0) { - r->w = vo_dwidth; r->h = vo_dheight; - } + r->w = vo_dwidth; r->h = vo_dheight; r->ml = r->mr = ass_border_x; r->mt = r->mb = ass_border_y; } else { |