[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.156,1.157 vo_gl2.c,1.34,1.35

[Attila Kinali CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv10527

Modified Files:
	x11_common.c vo_gl2.c 
Log Message:
dont fix things at the wrong place


Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- x11_common.c	20 Sep 2003 10:24:10 -0000	1.156
+++ x11_common.c	21 Sep 2003 11:27:11 -0000	1.157
@@ -700,7 +700,6 @@
            if ( vo_window == None ) break;
            vo_dwidth=Event.xconfigure.width;
            vo_dheight=Event.xconfigure.height;
-	   if (vo_fs) aspect(&vo_dwidth, &vo_dheight, A_ZOOM);
 #if 0
 	   /* when resizing, x and y are zero :( */
 	   vo_dx=Event.xconfigure.x;

Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- vo_gl2.c	21 Sep 2003 10:36:03 -0000	1.34
+++ vo_gl2.c	21 Sep 2003 11:27:11 -0000	1.35
@@ -565,9 +565,13 @@
 static void resize(int x,int y){
   printf("[gl2] Resize: %dx%d\n",x,y);
   if( vo_fs )
+  {
+	  aspect(&x, &y, A_ZOOM);
 	  glViewport( (vo_screenwidth-x)/2, (vo_screenheight-y)/2, x, y);
-  else 
+  } else { 
+	  aspect(&x, &y, A_NOZOOM);
 	  glViewport( 0, 0, x, y );
+  }
 
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();