# HG changeset patch # User reimar # Date 1251398528 0 # Node ID 41ac62d6f913c16cf22a96f7fe2585dcfb3f194e # Parent b1a437cdc60d7b15cc1868ed76cab2c47e20a72d Make gl2 code capable of windowed aspect and panscan (no user option to enable it yet though). diff -r b1a437cdc60d -r 41ac62d6f913 libvo/vo_gl2.c --- 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); }