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_vdpau.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_vdpau.c')
| -rw-r--r-- | video/out/opengl/hwdec_vdpau.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/opengl/hwdec_vdpau.c b/video/out/opengl/hwdec_vdpau.c index b9320ba842..086ebf5197 100644 --- a/video/out/opengl/hwdec_vdpau.c +++ b/video/out/opengl/hwdec_vdpau.c @@ -116,7 +116,7 @@ static int create(struct gl_hwdec *hw) return -1; p->vdp_surface = VDP_INVALID_HANDLE; p->mixer = mp_vdpau_mixer_create(p->ctx, hw->log); - if (hw->reject_emulated && mp_vdpau_guess_if_emulated(p->ctx)) { + if (hw->probing && mp_vdpau_guess_if_emulated(p->ctx)) { destroy(hw); return -1; } |