diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-02 17:59:10 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-02 17:59:10 +0300 |
| commit | 5aa7c02984536157448c234305c3aff7f7912727 (patch) | |
| tree | a008e5346cc9bb9b388021d6853af34b3c25683c /libvo | |
| parent | 0f95b7031421eec3aacb43ce7965f41755bc6e40 (diff) | |
| parent | 49c904b517a6bbb789ceaea80cb40323dadc1d29 (diff) | |
| download | mpv-5aa7c02984536157448c234305c3aff7f7912727.tar.bz2 mpv-5aa7c02984536157448c234305c3aff7f7912727.tar.xz | |
Merge svn changes up to r31284
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/video_out.c | 6 | ||||
| -rw-r--r-- | libvo/vo_gl.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 25a988e4f1..766dbb6862 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -185,6 +185,9 @@ const struct vo_driver *video_out_drivers[] = &video_out_x11, &video_out_xover, #endif +#ifdef CONFIG_SDL + &video_out_sdl, +#endif #ifdef CONFIG_GL &video_out_gl, &video_out_gl2, @@ -192,9 +195,6 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_DGA &video_out_dga, #endif -#ifdef CONFIG_SDL - &video_out_sdl, -#endif #ifdef CONFIG_GGI &video_out_ggi, #endif diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index c52ceabb5d..9642212d75 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -486,7 +486,7 @@ static void uninitGl(void) { static int isSoftwareGl(void) { const char *renderer = mpglGetString(GL_RENDERER); - return strcmp(renderer, "Software Rasterizer") == 0; + return !renderer || strcmp(renderer, "Software Rasterizer") == 0; } static void autodetectGlExtensions(void) { |