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

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;
       }