summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-08-27 18:42:08 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-08-27 18:42:08 +0000
commitf6e58b8a99359bab1e719bdecf036775e287db33 (patch)
tree81a26e325c3e7a4388c3468d70d91c744c54f612 /libvo
parent6765091bfac7782c0ef814f5983f4b92cccc3748 (diff)
downloadmpv-f6e58b8a99359bab1e719bdecf036775e287db33.tar.bz2
mpv-f6e58b8a99359bab1e719bdecf036775e287db33.tar.xz
Make gl2 code capable of windowed aspect and panscan (no user option to enable it yet though).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29567 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_gl2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index c8ffce50e5..654b34942a 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -421,10 +421,10 @@ static void drawTextureDisplay (void)
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 @@ flip_page(void)
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);
}