From f316f639105ebf5cc7bf29cc97d555bf425f7b4e Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 30 May 2010 13:50:14 +0000
Subject: Prefer -vo sdl over "probably software" OpenGL.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31283 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/video_out.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libvo')

diff --git a/libvo/video_out.c b/libvo/video_out.c
index de6fcfd8e4..a014833e98 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -194,6 +194,9 @@ const vo_functions_t* const 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,
@@ -201,9 +204,6 @@ const vo_functions_t* const video_out_drivers[] =
 #ifdef CONFIG_DGA
         &video_out_dga,
 #endif
-#ifdef CONFIG_SDL
-        &video_out_sdl,
-#endif
 #ifdef CONFIG_GGI
         &video_out_ggi,
 #endif
-- 
cgit v1.2.3


From 49c904b517a6bbb789ceaea80cb40323dadc1d29 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 30 May 2010 13:51:24 +0000
Subject: Treat a NULL renderer string as indication for software renderer.
 Usually it means OpenGL will not work at all.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31284 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/vo_gl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libvo')

diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 37ccd796de..a1981120af 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -470,7 +470,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) {
-- 
cgit v1.2.3