diff options
author | wm4 <wm4@nowhere> | 2013-02-06 22:29:21 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-02-06 23:04:18 +0100 |
commit | 4628ea3c46fe64cc9989e5a3e6f9b01f72563c36 (patch) | |
tree | c270974b419fcd37b156aee369b65402e9b494a2 /video | |
parent | 13d97077eceb299f853f21ffd630bd87d87373fe (diff) | |
download | mpv-4628ea3c46fe64cc9989e5a3e6f9b01f72563c36.tar.bz2 mpv-4628ea3c46fe64cc9989e5a3e6f9b01f72563c36.tar.xz |
video/out: change autoprobe order
Basically, move vo_opengl above the other VOs (except vo_vdpau). This
changes preferences on Windows and Linux.
Move vo_opengl_old further down and make it the last fallback (before
vo_x11).
vo_caca is crap (no pun intended), and should never be autoprobed.
Diffstat (limited to 'video')
-rw-r--r-- | video/out/vo.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/video/out/vo.c b/video/out/vo.c index f6151cfa27..e2e2d2d675 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -88,41 +88,37 @@ extern struct vo_driver video_out_corevideo; const struct vo_driver *video_out_drivers[] = { +#if CONFIG_VDPAU + &video_out_vdpau, +#endif +#ifdef CONFIG_GL + &video_out_opengl, +#endif #ifdef CONFIG_DIRECT3D &video_out_direct3d_shaders, &video_out_direct3d, #endif -#ifdef CONFIG_GL_COCOA - &video_out_opengl, - &video_out_opengl_old, -#endif #ifdef CONFIG_COREVIDEO &video_out_corevideo, #endif -#if CONFIG_VDPAU - &video_out_vdpau, -#endif #ifdef CONFIG_XV &video_out_xv, #endif -#ifdef CONFIG_GL -#if !defined CONFIG_GL_COCOA - &video_out_opengl, - &video_out_opengl_old, -#endif -#endif #ifdef CONFIG_SDL2 &video_out_sdl, #endif +#ifdef CONFIG_GL + &video_out_opengl_old, +#endif #ifdef CONFIG_X11 &video_out_x11, #endif -#ifdef CONFIG_CACA - &video_out_caca, -#endif &video_out_null, // should not be auto-selected &video_out_image, +#ifdef CONFIG_CACA + &video_out_caca, +#endif #ifdef CONFIG_ENCODING &video_out_lavc, #endif |