diff options
| author | wm4 <wm4@nowhere> | 2017-09-19 18:33:37 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-09-19 18:35:29 +0200 |
| commit | b881881dbd38a1720a9f8401fd1baafdd0dfccc0 (patch) | |
| tree | 55517b7a4ba33d8d3abf9dfcbff04064c2eb1bac /video/decode | |
| parent | 80e3173aa101ffd1c94b53299b325a0654562824 (diff) | |
| download | mpv-b881881dbd38a1720a9f8401fd1baafdd0dfccc0.tar.bz2 mpv-b881881dbd38a1720a9f8401fd1baafdd0dfccc0.tar.xz | |
Revert "vd_lavc: change auto-probe order to prefer cuda over vdpau-copy"
This reverts commit 96462040ec79b353457b64949f96fad30bd6e988.
I guess the autoprobing is still too primitive to handle this well. What
it really should be trying is initializing the wrapper decoder, and if
that doesn't work, try another method. This is complicated by hwaccels
initializing in a delayed way, so there is no easy solution yet.
Probably fixes #4865.
Diffstat (limited to 'video/decode')
| -rw-r--r-- | video/decode/vd_lavc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 476beeb9e6..e08246a296 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -261,11 +261,16 @@ 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, @@ -286,13 +291,6 @@ 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 }; |