diff options
author | wm4 <wm4@nowhere> | 2015-11-09 11:58:38 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-11-09 11:58:38 +0100 |
commit | 11888a927035c37759cddcbbb588c4f8b93296d1 (patch) | |
tree | 2d07c3a6450e22b57609c84e744926c1ec699846 /video/out/opengl/hwdec_vaglx.c | |
parent | 76e50f6a3d52a75bbee3b32b4f57a0e038cb4909 (diff) | |
download | mpv-11888a927035c37759cddcbbb588c4f8b93296d1.tar.bz2 mpv-11888a927035c37759cddcbbb588c4f8b93296d1.tar.xz |
vo_opengl: never load vaapi GLX interop by default
Causes more harm than it helps. Will eventually be removed.
Also rename the "reject_emulated" field to "probing" - this is more
appropriate now.
Diffstat (limited to 'video/out/opengl/hwdec_vaglx.c')
-rw-r--r-- | video/out/opengl/hwdec_vaglx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video/out/opengl/hwdec_vaglx.c b/video/out/opengl/hwdec_vaglx.c index 34e8ee937e..ff97d14857 100644 --- a/video/out/opengl/hwdec_vaglx.c +++ b/video/out/opengl/hwdec_vaglx.c @@ -74,6 +74,10 @@ static int create(struct gl_hwdec *hw) Display *x11disp = glXGetCurrentDisplay(); if (!x11disp) return -1; + if (hw->probing) { + MP_VERBOSE(hw, "Not using this by default.\n"); + return -1; + } int x11scr = DefaultScreen(x11disp); struct priv *p = talloc_zero(hw, struct priv); hw->priv = p; @@ -96,10 +100,6 @@ static int create(struct gl_hwdec *hw) vaTerminate(p->display); return -1; } - if (hw->reject_emulated && va_guess_if_emulated(p->ctx)) { - destroy(hw); - return -1; - } int attribs[] = { GLX_BIND_TO_TEXTURE_RGBA_EXT, True, |