[Mplayer-cvslog] CVS: main/DOCS video.html,1.15,1.16

[Winner of tha face compo]

Update of /cvsroot/mplayer/main/DOCS
In directory mplayer:/var/tmp.root/cvs-serv27532/DOCS

Modified Files:
	video.html 
Log Message:

mga_vid now cooperates with xv


Index: video.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/video.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- video.html	3 Oct 2001 20:35:30 -0000	1.15
+++ video.html	6 Oct 2001 14:49:59 -0000	1.16
@@ -542,9 +542,7 @@
 and build the 'mga' driver. Using it from <B>MPlayer</B> goes by '-vo mga' if
 you have matroxfb console, or '-vo xmga' under XFree86 3.x.x or 4.x.x.</P>
 
-<P>Note: '-vo xmga' works under XFree86 4.x.x, but it conflicts with the Xv
-driver, so avoid using both. If you messed up Xv with mga, try running
-<B>MPlayer</B> with '-vo mga' . It should fix Xv.</P>
+<P>The mga_vid driver cooperates with Xv.</P>
   
 
 <P><B><A NAME=2.2.1.8>2.2.1.8. SiS 6326 framebuffer (sis_vid)</A></B></P>