diff options
| author | wm4 <wm4@mplayer2.org> | 2012-04-24 00:48:14 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-04-24 01:25:33 +0200 |
| commit | 025caa9fb502b0c8a274ec4c3f4be37a27275141 (patch) | |
| tree | 55e4528341092ad344b096582d3659805e4e2706 /libvo/video_out.c | |
| parent | 70fe8d12fa6c4892274655672204b1d748727092 (diff) | |
| download | mpv-025caa9fb502b0c8a274ec4c3f4be37a27275141.tar.bz2 mpv-025caa9fb502b0c8a274ec4c3f4be37a27275141.tar.xz | |
vo_gl: refuse to use software renderer, unless explicitly requested
vo_gl will now fail at initialization if a software renderer is
detected. This is the same behavior as vo_gl_nosw. Making this the
default behavior is preferable, because it will simplify positioning
vo_gl in the VO autoprobe list (video_out_drivers[]). Also, vo_gl_nosw
exists only if X11 support is configured.
Move gl in place of gl_nosw. Add the "sw" suboption to vo_gl to allow
using vo_gl even if a software renderer is detected.
vo_gl_nosw is now completely equivalent to vo_gl. It is kept in order
not to break too many user configurations, but should be considered
deprecated.
Diffstat (limited to 'libvo/video_out.c')
| -rw-r--r-- | libvo/video_out.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 540fedb132..9b06794c61 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -171,20 +171,17 @@ const struct vo_driver *video_out_drivers[] = #endif #ifdef CONFIG_GL &video_out_gl3, +#if !defined CONFIG_GL_COCOA + &video_out_gl, #endif -#ifdef CONFIG_X11 -#ifdef CONFIG_GL - &video_out_gl_nosw, #endif +#ifdef CONFIG_X11 &video_out_x11, &video_out_xover, #endif #ifdef CONFIG_SDL &video_out_sdl, #endif -#if (defined CONFIG_GL && !defined CONFIG_GL_COCOA) - &video_out_gl, -#endif #ifdef CONFIG_DGA &video_out_dga, #endif @@ -248,6 +245,11 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_MD5SUM &video_out_md5sum, #endif +#ifdef CONFIG_X11 +#ifdef CONFIG_GL + &video_out_gl_nosw, +#endif +#endif NULL }; |