diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch |
reinit the tree, so we can have metadata
Diffstat (limited to 'media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch')
-rw-r--r-- | media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch new file mode 100644 index 000000000000..e83be2250e72 --- /dev/null +++ b/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch @@ -0,0 +1,50 @@ +commit b881881dbd38a1720a9f8401fd1baafdd0dfccc0 +Author: wm4 <wm4@nowhere> +Date: Tue Sep 19 18:33:37 2017 +0200 + +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. + +diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c +index 476beeb9e..e08246a29 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, + +@@ -285,13 +290,6 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { + &mp_vd_lavc_cuda_old, + #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 |