From 7b5a2588bd33d5cf532a1c83d79dba20a3f26bc5 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 13 Feb 2018 00:49:13 +0100
Subject: vo: make opengl-cb first in the autoprobing order

This should be helpful for the new OSX Cocoa backend, which uses
opengl-cb internally. Since it comes with a behavior change that could
possibly interfere with libmpv/opengl_cb users, we mark it as explicit
API change.
---
 video/out/vo.c           | 6 +++---
 video/out/vo_opengl_cb.c | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'video')

diff --git a/video/out/vo.c b/video/out/vo.c
index c999138eee..b2aba3af7a 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -66,6 +66,9 @@ extern const struct vo_driver video_out_tct;
 
 const struct vo_driver *const video_out_drivers[] =
 {
+#if HAVE_GL
+    &video_out_opengl_cb,
+#endif
 #if HAVE_ANDROID
     &video_out_mediacodec_embed,
 #endif
@@ -103,9 +106,6 @@ const struct vo_driver *const video_out_drivers[] =
 #endif
 #if HAVE_ENCODING
     &video_out_lavc,
-#endif
-#if HAVE_GL
-    &video_out_opengl_cb,
 #endif
     NULL
 };
diff --git a/video/out/vo_opengl_cb.c b/video/out/vo_opengl_cb.c
index 4be36118a0..40dcb035ca 100644
--- a/video/out/vo_opengl_cb.c
+++ b/video/out/vo_opengl_cb.c
@@ -554,7 +554,8 @@ static int preinit(struct vo *vo)
     struct vo_priv *p = vo->priv;
     p->ctx = vo->extra.opengl_cb_context;
     if (!p->ctx) {
-        MP_FATAL(vo, "No context set.\n");
+        if (!vo->probing)
+            MP_FATAL(vo, "No context set.\n");
         return -1;
     }
 
-- 
cgit v1.2.3