[MPlayer-cvslog] CVS: main/libvo vo_sdl.c,1.119,1.120

[Ivo van Poorten CVS]

CVS change done by Ivo van Poorten CVS

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

Modified Files:
	vo_sdl.c 
Log Message:

10l Don't set SDL to X11 by default.



Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- vo_sdl.c	1 Mar 2005 03:51:48 -0000	1.119
+++ vo_sdl.c	1 Mar 2005 19:59:20 -0000	1.120
@@ -1593,7 +1593,7 @@
 static uint32_t preinit(const char *arg)
 {
     struct sdl_priv_s *priv = &sdl_priv;
-    char * sdl_driver;
+    char * sdl_driver = NULL;
     int sdl_hwaccel;
     int sdl_forcexv;
     opt_t subopts[] = {
@@ -1605,7 +1605,6 @@
 
     sdl_forcexv = 1;
     sdl_hwaccel = 1;
-    sdl_driver = strdup("x11");
 
     if (subopt_parse(arg, subopts) != 0) return -1;
 
@@ -1615,8 +1614,10 @@
 
     if(verbose > 2) printf("SDL: Opening Plugin\n");
 
-    if(sdl_driver) setenv("SDL_VIDEODRIVER", sdl_driver, 1);
+    if(sdl_driver) {
+        setenv("SDL_VIDEODRIVER", sdl_driver, 1);
     free(sdl_driver);
+    }
 
     /* does the user want SDL to try and force Xv */
     if(sdl_forcexv)	setenv("SDL_VIDEO_X11_NODIRECTCOLOR", "1", 1);