summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-03-01 19:59:20 +0000
committerivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-03-01 19:59:20 +0000
commit5fba3234897b2570703611fa2b38bb6655137363 (patch)
tree89d6440c8896a107953a8752aa09e138e83876f8 /libvo
parent68e599a13eb97570536eb67761299a2c98c4acf8 (diff)
downloadmpv-5fba3234897b2570703611fa2b38bb6655137363.tar.bz2
mpv-5fba3234897b2570703611fa2b38bb6655137363.tar.xz
10l Don't set SDL to X11 by default.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14877 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_sdl.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c
index 59e32ed84f..8ced65e36d 100644
--- a/libvo/vo_sdl.c
+++ b/libvo/vo_sdl.c
@@ -1593,7 +1593,7 @@ uninit(void)
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 @@ static uint32_t preinit(const char *arg)
sdl_forcexv = 1;
sdl_hwaccel = 1;
- sdl_driver = strdup("x11");
if (subopt_parse(arg, subopts) != 0) return -1;
@@ -1615,8 +1614,10 @@ static uint32_t preinit(const char *arg)
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);