diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2015-11-10 18:45:08 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2015-11-10 18:45:08 +0100 |
| commit | 273607c1c6f77859e9a0cb98c3e4c74bc354fd8d (patch) | |
| tree | 0fbd329857356bddf1d4dfbcf09ca4fbe2d6f0f9 /video/out/opengl/hwdec.c | |
| parent | 5b7d0fbab31cb70d05bb7f757283c1ee4028b091 (diff) | |
| parent | fee45c01703ace0d6af7b8fe60d151be245a0e3f (diff) | |
| download | mpv-273607c1c6f77859e9a0cb98c3e4c74bc354fd8d.tar.bz2 mpv-273607c1c6f77859e9a0cb98c3e4c74bc354fd8d.tar.xz | |
Merge branch 'master' into release/current
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 6eefbc4744..2a8c1eb14b 100644 --- a/video/out/opengl/hwdec.c +++ b/video/out/opengl/hwdec.c @@ -64,7 +64,7 @@ static struct gl_hwdec *load_hwdec_driver(struct mp_log *log, GL *gl, .log = mp_log_new(hwdec, log, drv->api_name), .gl = gl, .gl_texture_target = GL_TEXTURE_2D, - .reject_emulated = is_auto, + .probing = is_auto, }; mp_verbose(log, "Loading hwdec driver '%s'\n", drv->api_name); if (hwdec->driver->create(hwdec) < 0) { |