RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vf_vdpaupp: fix error handling and software input mode 

Crashed when no vdpau device was loaded. Also there was a mistake of not
setting p->ctx, which broke software surface input mode. This was not
found before, because p->ctx is not needed for anything else.

Fixes #5294.
This commit is contained in:
wm4 2017-12-27 04:54:15 +01:00 committed by Kevin Mitchell
parent b51f6c59b9
commit 9708248eb3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
video/filter/vf_vdpaupp.c
View File

@ -183,18 +183,22 @@ static int vf_open(vf_instance_t *vf)
hwdec_devices_request_all(vf->hwdec_devs);
AVBufferRef *ref =
hwdec_devices_get_lavc(vf->hwdec_devs, AV_HWDEVICE_TYPE_VDPAU);
struct mp_vdpau_ctx *ctx = mp_vdpau_get_ctx_from_av(ref);
if (!ref)
goto error;
p->ctx = mp_vdpau_get_ctx_from_av(ref);
av_buffer_unref(&ref);
if (!ctx) {
uninit(vf);
return 0;
}
if (!p->ctx)
goto error;
p->def_deintmode = p->opts.deint;
if (!p->deint_enabled)
p->opts.deint = 0;
return 1;
error:
uninit(vf);
return 0;
}
#define OPT_BASE_STRUCT struct vf_priv_s