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_vaglx.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_vaglx.c')
| -rw-r--r-- | video/out/opengl/hwdec_vaglx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/video/out/opengl/hwdec_vaglx.c b/video/out/opengl/hwdec_vaglx.c index 6248a64434..fb75b48d06 100644 --- a/video/out/opengl/hwdec_vaglx.c +++ b/video/out/opengl/hwdec_vaglx.c @@ -74,10 +74,6 @@ 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; @@ -205,6 +201,7 @@ const struct gl_hwdec_driver gl_hwdec_vaglx = { .name = "vaapi-glx", .api = HWDEC_VAAPI, .imgfmt = IMGFMT_VAAPI, + .testing_only = true, .create = create, .reinit = reinit, .map_frame = map_frame, |