# HG changeset patch
# User reimar
# Date 1251381293 0
# Node ID 0421934c81ac8b4780779c09c690081e9c0fa8e4
# Parent  24b40e352024c950d7a06155f771d0a613105297
Simplify and fix ass border calculations for -vo gl and -wid -fs mode.

diff -r 24b40e352024 -r 0421934c81ac libvo/vo_gl.c
--- a/libvo/vo_gl.c	Thu Aug 27 13:31:12 2009 +0000
+++ b/libvo/vo_gl.c	Thu Aug 27 13:54:53 2009 +0000
@@ -173,8 +173,8 @@
     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 @@
       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 {