summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-28 20:52:54 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-28 20:52:54 +0000
commit5e40a0ee4cc14cae2c8230c83b6ecbdfb72290aa (patch)
tree3f8bb715b14858c5929069467498c325cc711e3e /libvo
parentb2a574d55a0575ff26a550d72b87fbfe9a96e02f (diff)
downloadmpv-5e40a0ee4cc14cae2c8230c83b6ecbdfb72290aa.tar.bz2
mpv-5e40a0ee4cc14cae2c8230c83b6ecbdfb72290aa.tar.xz
use XF86VidMode later in init (at line 1031) only if we've got support (if have_vm==1)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3853 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_dga.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c
index 7d973eb87f..bf0c0c62a6 100644
--- a/libvo/vo_dga.c
+++ b/libvo/vo_dga.c
@@ -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 @@ static uint32_t init( uint32_t width, uint32_t height,
#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),