diff options
author | wm4 <wm4@nowhere> | 2017-08-30 12:08:40 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-08-30 12:08:40 +0200 |
commit | 96462040ec79b353457b64949f96fad30bd6e988 (patch) | |
tree | 7f101b7aa52fd66aa46881d19bbedb549effbbf6 /video/decode/vd_lavc.c | |
parent | 93d40ac4801a4eeeeb865bde29bac9c12149f5e4 (diff) | |
download | mpv-96462040ec79b353457b64949f96fad30bd6e988.tar.bz2 mpv-96462040ec79b353457b64949f96fad30bd6e988.tar.xz |
vd_lavc: change auto-probe order to prefer cuda over vdpau-copy
This aims at making --opengl-hwdec-interop=cuda --hwdec=yes select the
correct decoding mode: cuda instead of vdpau-copy.
Diffstat (limited to 'video/decode/vd_lavc.c')
-rw-r--r-- | video/decode/vd_lavc.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index e08246a296..476beeb9e6 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -261,16 +261,11 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { #endif #if HAVE_VDPAU_HWACCEL &mp_vd_lavc_vdpau, - &mp_vd_lavc_vdpau_copy, #endif #if HAVE_VIDEOTOOLBOX_HWACCEL &mp_vd_lavc_videotoolbox, &mp_vd_lavc_videotoolbox_copy, #endif -#if HAVE_VAAPI_HWACCEL - &mp_vd_lavc_vaapi, - &mp_vd_lavc_vaapi_copy, -#endif #if HAVE_D3D_HWACCEL &mp_vd_lavc_d3d11va, @@ -291,6 +286,13 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { #endif &mp_vd_lavc_cuda_copy, #endif +#if HAVE_VDPAU_HWACCEL + &mp_vd_lavc_vdpau_copy, +#endif +#if HAVE_VAAPI_HWACCEL + &mp_vd_lavc_vaapi, + &mp_vd_lavc_vaapi_copy, +#endif &mp_vd_lavc_crystalhd, NULL }; |