From 96462040ec79b353457b64949f96fad30bd6e988 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 30 Aug 2017 12:08:40 +0200
Subject: 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.
---
 video/decode/vd_lavc.c | 12 +++++++-----
 1 file 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,
 
@@ -290,6 +285,13 @@ 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