comparison libvo/vo_sdl.c @ 14876:2b14e57570a8

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

14875:5ce2aca02b92

}

static uint32_t preinit(const char *arg)
{
    struct sdl_priv_s *priv = &sdl_priv;
    char * sdl_driver;
    int sdl_hwaccel;
    int sdl_forcexv;
    opt_t subopts[] = {
	    {"forcexv", OPT_ARG_BOOL,  &sdl_forcexv, NULL, 0},
	    {"hwaccel", OPT_ARG_BOOL,  &sdl_hwaccel, NULL, 0},

	    {NULL, 0, NULL, NULL, 0}
    };

    sdl_forcexv = 1;
    sdl_hwaccel = 1;
    sdl_driver = strdup("x11");

    if (subopt_parse(arg, subopts) != 0) return -1;

    priv->rgbsurface = NULL;
    priv->overlay = NULL;
    priv->surface = NULL;

    if(verbose > 2) printf("SDL: Opening Plugin\n");

    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);
    else setenv("SDL_VIDEO_X11_NODIRECTCOLOR", "0", 1);

14876:2b14e57570a8

}

static uint32_t preinit(const char *arg)
{
    struct sdl_priv_s *priv = &sdl_priv;
    char * sdl_driver = NULL;
    int sdl_hwaccel;
    int sdl_forcexv;
    opt_t subopts[] = {
	    {"forcexv", OPT_ARG_BOOL,  &sdl_forcexv, NULL, 0},
	    {"hwaccel", OPT_ARG_BOOL,  &sdl_hwaccel, NULL, 0},

	    {NULL, 0, NULL, NULL, 0}
    };

    sdl_forcexv = 1;
    sdl_hwaccel = 1;

    if (subopt_parse(arg, subopts) != 0) return -1;

    priv->rgbsurface = NULL;
    priv->overlay = NULL;
    priv->surface = NULL;

    if(verbose > 2) printf("SDL: Opening Plugin\n");

    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);
    else setenv("SDL_VIDEO_X11_NODIRECTCOLOR", "0", 1);