[Mplayer-cvslog] CVS: main/libvo video_out.c, 1.84, 1.85 video_out.h, 1.55, 1.56 x11_common.c, 1.170, 1.171

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv9424/libvo

Modified Files:
	video_out.c video_out.h x11_common.c 
Log Message:
keepaspect and nokeepaspect are now useable by all vos

Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- video_out.c	6 Apr 2004 00:04:48 -0000	1.84
+++ video_out.c	1 May 2004 14:52:15 -0000	1.85
@@ -43,6 +43,7 @@
 int vo_ontop = 0;
 int vo_adapter_num=0;
 int vo_refresh_rate=0;
+int vo_keepaspect=1;
 
 int vo_pts=0; // for hw decoding
 float vo_fps=0; // for mp1e rte

Index: video_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- video_out.h	13 Mar 2004 16:48:52 -0000	1.55
+++ video_out.h	1 May 2004 14:52:15 -0000	1.56
@@ -198,6 +198,7 @@
 extern float vo_panscan;
 extern int vo_adapter_num;
 extern int vo_refresh_rate;
+extern int vo_keepaspect;
 
 extern int vo_gamma_brightness;
 extern int vo_gamma_saturation;

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- x11_common.c	5 Apr 2004 21:35:30 -0000	1.170
+++ x11_common.c	1 May 2004 14:52:15 -0000	1.171
@@ -103,8 +103,6 @@
 static int vo_old_width = 0;
 static int vo_old_height = 0;
 
-int vo_x11_keepaspect = 1;
-
 #ifdef HAVE_XINERAMA
 int xinerama_screen = 0;
 int xinerama_x = 0;
@@ -825,7 +823,7 @@
 void vo_x11_sizehint( int x, int y, int width, int height, int max )
 {
  vo_hint.flags=PPosition | PSize | PWinGravity;
- if(vo_x11_keepaspect)
+ if(vo_keepaspect)
  {
  	vo_hint.flags |= PAspect;
 	vo_hint.min_aspect.x = width;