diff options
author | wm4 <wm4@nowhere> | 2018-02-13 00:49:13 +0100 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-02-13 17:45:29 -0800 |
commit | 7b5a2588bd33d5cf532a1c83d79dba20a3f26bc5 (patch) | |
tree | a9f68b827218f3a4404cad2a2eaa4c0c15505eed /video | |
parent | 706bb1d0c756be95e8646c6e433d5d24f7c75dca (diff) | |
download | mpv-7b5a2588bd33d5cf532a1c83d79dba20a3f26bc5.tar.bz2 mpv-7b5a2588bd33d5cf532a1c83d79dba20a3f26bc5.tar.xz |
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.
Diffstat (limited to 'video')
-rw-r--r-- | video/out/vo.c | 6 | ||||
-rw-r--r-- | video/out/vo_opengl_cb.c | 3 |
2 files changed, 5 insertions, 4 deletions
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 @@ -104,9 +107,6 @@ const struct vo_driver *const video_out_drivers[] = #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; } |