Mercurial > mplayer.hg

changeset 29525:41ac62d6f913

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make gl2 code capable of windowed aspect and panscan (no user option to enable it yet though).
author reimar
date Thu, 27 Aug 2009 18:42:08 +0000
parents b1a437cdc60d
children 53a2b67e6290
files libvo/vo_gl2.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_gl2.c	Thu Aug 27 18:36:51 2009 +0000
+++ b/libvo/vo_gl2.c	Thu Aug 27 18:42:08 2009 +0000
@@ -421,10 +421,10 @@
 
 static void resize(int x,int y){
   mp_msg(MSGT_VO,MSGL_V,"[gl2] Resize: %dx%d\n",x,y);
-  if( vo_fs ) {
+  if(aspect_scaling()) {
     glClear(GL_COLOR_BUFFER_BIT);
-    aspect(&x, &y, A_ZOOM);
-    panscan_calc();
+    aspect(&x, &y, A_WINZOOM);
+    panscan_calc_windowed();
     x += vo_panscan_x;
     y += vo_panscan_y;
     glViewport( (vo_dwidth-x)/2, (vo_dheight-y)/2, x, y);
@@ -738,7 +738,7 @@
   glFinish();
   swapGlBuffers();
 
-  if (vo_fs) // Avoid flickering borders in fullscreen mode
+  if (aspect_scaling()) // Avoid flickering borders in fullscreen mode
     glClear (GL_COLOR_BUFFER_BIT);
 }