From 11888a927035c37759cddcbbb588c4f8b93296d1 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 9 Nov 2015 11:58:38 +0100
Subject: 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.
---
 video/out/opengl/hwdec_vaglx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'video/out/opengl/hwdec_vaglx.c')

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,
-- 
cgit v1.2.3