RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14877 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ivo 2005-03-01 19:59:20 +00:00
parent 68e599a13e
commit 5fba323489
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOCS/man/en/mplayer.1
View File

@ -2418,7 +2418,7 @@ any effect on SDL.
.PD 0
.RSs
.IPs driver=<driver>
Explicitly choose the SDL driver to use (default: x11).
Explicitly choose the SDL driver to use.
.IPs (no)forcexv
Use XVideo through the sdl video output driver (default: forcexv).
.IPs (no)hwaccel

7
libvo/vo_sdl.c
View File

@ -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);