summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-09-22 05:18:06 +0200
committerwm4 <wm4@nowhere>2017-09-22 05:19:37 +0200
commit2b855739d50ff924a8124bc61f72a375a88af06f (patch)
tree5e62b53df21190556afbc376322f63a7f7a9531b /video
parent6254b6d63776ec123453f52c373fa7af5abbdbfb (diff)
downloadmpv-2b855739d50ff924a8124bc61f72a375a88af06f.tar.bz2
mpv-2b855739d50ff924a8124bc61f72a375a88af06f.tar.xz
vd_lavc: revert accidental vaapi changes revert
Commit bfa9b628589068 accidentally reverted these (because my editor did not reload the file correctly). Fixes #4904.
Diffstat (limited to 'video')
-rw-r--r--video/decode/vd_lavc.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 82ab752165..d861ff2182 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -259,11 +259,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,
@@ -284,13 +289,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
};