[MPlayer-cvslog] r36404 - trunk/libvo/vo_gl.c

[reimar]

Author: reimar
Date: Mon Aug  5 18:51:10 2013
New Revision: 36404

Log:
Make fallback for failing context creation actually work.

Modified:
   trunk/libvo/vo_gl.c

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Mon Aug  5 18:48:56 2013	(r36403)
+++ trunk/libvo/vo_gl.c	Mon Aug  5 18:51:10 2013	(r36404)
@@ -1361,11 +1361,11 @@ static int preinit_internal(const char *
     if (use_yuv == -1 || !allow_sw) {
       if (create_window(320, 200, VOFLAG_HIDDEN, NULL) < 0)
         goto err_out;
-      if (glctx.setGlWindow(&glctx) == SET_WINDOW_FAILED)
-        goto err_out;
-      if (!allow_sw && isSoftwareGl())
-        goto err_out;
-      autodetectGlExtensions();
+      if (glctx.setGlWindow(&glctx) != SET_WINDOW_FAILED) {
+        if (!allow_sw && isSoftwareGl())
+          goto err_out;
+        autodetectGlExtensions();
+      }
     }
     if (use_yuv == -1)
       use_yuv = glctx.type == GLTYPE_EGL_X11 || glctx.type == GLTYPE_EGL_ANDROID ? YUV_CONVERSION_SL_PROGRAM : YUV_CONVERSION_FRAGMENT_LOOKUP; // mostly sensible fallback