summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-08-27 14:07:15 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-08-27 14:07:15 +0000
commitc3067ee82f07563ac102cea947707e97e475710f (patch)
tree584f0c2bcab2bc84cf55c843224a8156a345e768 /libvo
parentc2edb80335330b5f02059a0321c975e6b6718638 (diff)
downloadmpv-c3067ee82f07563ac102cea947707e97e475710f.tar.bz2
mpv-c3067ee82f07563ac102cea947707e97e475710f.tar.xz
Simplify -vo gl ass border etc. dimension calculation one bit more.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29563 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_gl.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 8a080bdfb0..27d5463fc8 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -1145,14 +1145,12 @@ static int control(uint32_t request, void *data, ...)
case VOCTRL_GET_EOSD_RES:
{
mp_eosd_res_t *r = data;
+ r->w = vo_dwidth; r->h = vo_dheight;
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_dwidth; r->h = vo_dheight;
r->ml = r->mr = ass_border_x;
r->mt = r->mb = ass_border_y;
- } else {
- r->w = vo_dwidth; r->h = vo_dheight;
}
}
return VO_TRUE;