[Mplayer-cvslog] CVS: main/libvo vo_dga.c,1.62,1.63 vo_x11.c,1.130,1.131 x11_common.c,1.144,1.145

[Alex Beregszaszi]

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

Modified Files:
	vo_dga.c vo_x11.c x11_common.c 
Log Message:
warning fixes by Dominik Mierzejewski <dominik at rangers.eu.org>

Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- vo_dga.c	29 Apr 2003 17:15:14 -0000	1.62
+++ vo_dga.c	30 May 2003 18:05:48 -0000	1.63
@@ -497,6 +497,7 @@
        // as long as it's above 50 Hz (acki2 on 30/3/2001)
        ||
        (
+	(
 	(new_x == *old_x) &&
 	(new_y == *old_y) &&
 	(
@@ -509,6 +510,7 @@
 	  new_vbi < *old_vbi &&
 	  new_vbi >= 50
 	 )
+	)
 	)
         ||
         // if everything is equal, then use the mode with the lower 

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- vo_x11.c	23 May 2003 21:20:12 -0000	1.130
+++ vo_x11.c	30 May 2003 18:05:49 -0000	1.131
@@ -262,7 +262,7 @@
    depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual);
  }
  if ( !XMatchVisualInfo( mDisplay,mScreen,depth,DirectColor,&vinfo ) ||
-      WinID > 0 && vinfo.visualid != XVisualIDFromVisual(attribs.visual))
+      (WinID > 0 && vinfo.visualid != XVisualIDFromVisual(attribs.visual)))
    XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo );
 
  /* set image size (which is indeed neither the input nor output size), 

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- x11_common.c	26 May 2003 08:34:17 -0000	1.144
+++ x11_common.c	30 May 2003 18:05:49 -0000	1.145
@@ -105,6 +105,8 @@
 XF86VidModeModeLine modeline;
 #endif
 
+int vo_x11_get_fs_type( int supported );
+
 void vo_hidecursor ( Display *disp , Window win )
 {
 	Cursor no_ptr;