[Mplayer-cvslog] CVS: main/libvo vo_dga.c,1.34,1.35

[Alex Beregszaszi]

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

Modified Files:
	vo_dga.c 
Log Message:
use XF86VidMode later in init (at line 1031) only if we've got support (if have_vm==1)

Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- vo_dga.c	4 Dec 2001 17:24:25 -0000	1.34
+++ vo_dga.c	28 Dec 2001 20:52:54 -0000	1.35
@@ -23,6 +23,9 @@
  * - works only on x86 architectures
  *
  * $Log$
+ * Revision 1.35  2001/12/28 20:52:54  alex
+ * use XF86VidMode later in init (at line 1031) only if we've got support (if have_vm==1)
+ *
  * Revision 1.34  2001/12/04 17:24:25  alex
  * do not crash if can't get modelines (dga2.0)
  *
@@ -1024,11 +1027,14 @@
 #else
   
 #ifdef HAVE_XF86VM
+  if (have_vm)
+  {
     XF86VidModeLockModeSwitch(vo_dga_dpy,XDefaultScreen(vo_dga_dpy),0);
     // Two calls are needed to switch modes on my ATI Rage 128. Why?
     // for riva128 one call is enough!
     XF86VidModeSwitchToMode(vo_dga_dpy,XDefaultScreen(vo_dga_dpy),vo_dga_vidmodes[dga_modenum]);
     XF86VidModeSwitchToMode(vo_dga_dpy,XDefaultScreen(vo_dga_dpy),vo_dga_vidmodes[dga_modenum]);
+  }
 #endif
   
   XF86DGAGetViewPortSize(vo_dga_dpy,XDefaultScreen(vo_dga_dpy),