diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-11-04 08:31:58 +0100 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-11-04 08:31:58 +0100 |
| commit | 90875001793400c01f8290260cec2e284620477f (patch) | |
| tree | e1a05cbe8599e8c27542efe712c21fa1c41d7f97 /video/out/vo.c | |
| parent | 5b6eab01af32cdf886f0ae9fc1c50e3aa1584da2 (diff) | |
| parent | 3a831b2c016944c1f976d07c5ee9002c6250d9ac (diff) | |
| download | mpv-90875001793400c01f8290260cec2e284620477f.tar.bz2 mpv-90875001793400c01f8290260cec2e284620477f.tar.xz | |
Merge remote-tracking branch 'origin/have_configure'
Diffstat (limited to 'video/out/vo.c')
| -rw-r--r-- | video/out/vo.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/video/out/vo.c b/video/out/vo.c index 061fc9caf3..737c9c34f9 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -66,47 +66,47 @@ extern struct vo_driver video_out_wayland; const struct vo_driver *video_out_drivers[] = { -#if CONFIG_VDPAU +#if HAVE_VDPAU &video_out_vdpau, #endif -#ifdef CONFIG_GL +#if HAVE_GL &video_out_opengl, #endif -#ifdef CONFIG_DIRECT3D +#if HAVE_DIRECT3D &video_out_direct3d_shaders, &video_out_direct3d, #endif -#ifdef CONFIG_COREVIDEO +#if HAVE_COREVIDEO &video_out_corevideo, #endif -#ifdef CONFIG_XV +#if HAVE_XV &video_out_xv, #endif -#ifdef CONFIG_SDL2 +#if HAVE_SDL2 &video_out_sdl, #endif -#ifdef CONFIG_GL +#if HAVE_GL &video_out_opengl_old, #endif -#if CONFIG_VAAPI +#if HAVE_VAAPI &video_out_vaapi, #endif -#ifdef CONFIG_X11 +#if HAVE_X11 &video_out_x11, #endif &video_out_null, // should not be auto-selected &video_out_image, -#ifdef CONFIG_CACA +#if HAVE_CACA &video_out_caca, #endif -#ifdef CONFIG_ENCODING +#if HAVE_ENCODING &video_out_lavc, #endif -#ifdef CONFIG_GL +#if HAVE_GL &video_out_opengl_hq, #endif -#ifdef CONFIG_WAYLAND +#if HAVE_WAYLAND &video_out_wayland, #endif NULL |