[MPlayer-cvslog] r29563 - trunk/libvo/vo_gl.c

[reimar]

Author: reimar
Date: Thu Aug 27 16:07:15 2009
New Revision: 29563

Log:
Simplify -vo gl ass border etc. dimension calculation one bit more.

Modified:
   trunk/libvo/vo_gl.c

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Thu Aug 27 16:01:39 2009	(r29562)
+++ trunk/libvo/vo_gl.c	Thu Aug 27 16:07:15 2009	(r29563)
@@ -1145,14 +1145,12 @@ static int control(uint32_t request, voi
   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;