[MPlayer-cvslog] CVS: main/libvo video_out.c,1.102,1.103

[Ivan Kalvachev CVS]

CVS change done by Ivan Kalvachev CVS

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

Modified Files:
	video_out.c 
Log Message:
prevent xvmc from been loaded before xv, and generally before any autoprobed output


Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- video_out.c	1 Dec 2005 11:58:44 -0000	1.102
+++ video_out.c	18 Jan 2006 18:11:02 -0000	1.103
@@ -163,9 +163,6 @@
 #ifdef HAVE_3DFX
         &video_out_3dfx,
 #endif
-#ifdef HAVE_XVMC
-        &video_out_xvmc,
-#endif
 #ifdef HAVE_XV
         &video_out_xv,
 #endif
@@ -233,6 +230,9 @@
 #endif
         &video_out_null,
 	// should not be auto-selected
+#ifdef HAVE_XVMC
+        &video_out_xvmc,
+#endif
 	&video_out_mpegpes,
 	&video_out_yuv4mpeg,
 #ifdef HAVE_PNG