Mercurial > mplayer.hg

changeset 36308:687e65bf99f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make fallback for failing context creation actually work.
author reimar
date Mon, 05 Aug 2013 16:51:10 +0000
parents a3a1ad19b8b4
children 583523331410
files libvo/vo_gl.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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