diff options
author | wm4 <wm4@nowhere> | 2017-07-07 12:29:29 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-07-07 12:29:29 +0200 |
commit | ae4c0134ed65d576ddfcada94143b3f0302029ae (patch) | |
tree | 6bd9345c71456082ab61c299ad608d424700f7b9 /video/out/opengl/hwdec.c | |
parent | 9c9d3e7b25c85368f9e8f24d6f5f7f5cc49510e3 (diff) | |
download | mpv-ae4c0134ed65d576ddfcada94143b3f0302029ae.tar.bz2 mpv-ae4c0134ed65d576ddfcada94143b3f0302029ae.tar.xz |
vo_opengl: do not use vaapi-over-GLX
This backend is selected if vaapi is available, but vaapi-over-EGL is
not. This causes various issues around the forced RGB conversion, which
is done with fixed, usually incorrect parameters.
It seems the existing auto probing check is too weak, and doesn't really
prevent it from getting loaded. Fix this by adding a flag to not ever
load this during auto probing.
I'm still not deleting it, because it's useful for testing on nvidia
machines.
See #4555.
Diffstat (limited to 'video/out/opengl/hwdec.c')
-rw-r--r-- | video/out/opengl/hwdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/opengl/hwdec.c b/video/out/opengl/hwdec.c index 346493671f..c9256c9c5b 100644 --- a/video/out/opengl/hwdec.c +++ b/video/out/opengl/hwdec.c @@ -101,7 +101,7 @@ struct gl_hwdec *gl_hwdec_load_api(struct mp_log *log, GL *gl, bool is_auto = HWDEC_IS_AUTO(api); for (int n = 0; mpgl_hwdec_drivers[n]; n++) { const struct gl_hwdec_driver *drv = mpgl_hwdec_drivers[n]; - if (is_auto || api == drv->api) { + if ((is_auto || api == drv->api) && !drv->testing_only) { struct gl_hwdec *r = load_hwdec_driver(log, gl, g, devs, drv, is_auto); if (r) return r; |