From 2b855739d50ff924a8124bc61f72a375a88af06f Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 22 Sep 2017 05:18:06 +0200
Subject: vd_lavc: revert accidental vaapi changes revert

Commit bfa9b628589068 accidentally reverted these (because my editor did
not reload the file correctly).

Fixes #4904.
---
 video/decode/vd_lavc.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'video/decode')

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,
 
@@ -283,13 +288,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
-- 
cgit v1.2.3