summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-10-19 18:16:23 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-10-19 18:16:23 +0000
commit92efd606d11ed0e1da9bb0896e809fda9f825d19 (patch)
tree44e0be41e266ed4b0dcdfe24d34d73c3dd776538 /libvo
parent930d55589c0b087426602ca6f1847c08d9b82f08 (diff)
downloadmpv-92efd606d11ed0e1da9bb0896e809fda9f825d19.tar.bz2
mpv-92efd606d11ed0e1da9bb0896e809fda9f825d19.tar.xz
Avoid text deformation and subtitles moving outside the screen in pan-and-scan
mode. For this, crop amounts are passed from vo_gl as negative margins sizes. They are used to calculate aspect ratio. They are ignored when calculating subtitle positions, so subtitles will stay on screen most of the time. Based on a patch by Jindrich Makovicka [makovick gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24815 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_gl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index a81c783365..9b8e55fdd5 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -907,8 +907,8 @@ static int control(uint32_t request, void *data, ...)
if (scaled_osd) {r->w = image_width; r->h = image_height;}
else if (vo_fs) {
r->w = vo_screenwidth; r->h = vo_screenheight;
- r->ml = r->mr = ass_border_x > 0 ? ass_border_x : 0;
- r->mt = r->mb = ass_border_y > 0 ? ass_border_y : 0;
+ r->ml = r->mr = ass_border_x;
+ r->mt = r->mb = ass_border_y;
} else {
r->w = vo_dwidth; r->h = vo_dheight;
}