# HG changeset patch # User reimar # Date 1375721470 0 # Node ID 687e65bf99f93ba2dbf53f6762e28958cef5c8d6 # Parent a3a1ad19b8b473257ed4ebae2bfbc971eb0d2c7b Make fallback for failing context creation actually work. diff -r a3a1ad19b8b4 -r 687e65bf99f9 libvo/vo_gl.c --- a/libvo/vo_gl.c Mon Aug 05 16:48:56 2013 +0000 +++ b/libvo/vo_gl.c Mon Aug 05 16:51:10 2013 +0000 @@ -1361,11 +1361,11 @@ 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