From 506d94ab01117545674200847b00d214b6619ae8 Mon Sep 17 00:00:00 2001
From: Ross Patterson <me@rpatterson.net>
Date: Mon, 12 Aug 2019 13:50:36 -0700
Subject: [PATCH] Detect: Improve hwaccel preference ordering

---
 ffmpeg/_detect.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ffmpeg/_detect.py b/ffmpeg/_detect.py
index 84d048c..359e98d 100644
--- a/ffmpeg/_detect.py
+++ b/ffmpeg/_detect.py
@@ -46,14 +46,18 @@ MODEL_RANGE_SEPARATORS = ['-', '>']
 HWACCEL = dict(
     # List `hwaccel` options by order of expected performance when available.
     BY_PERFORMANCE=[
-        # NVidia
-        'nvdec', 'cuvid', 'cuda',
-        # AMD
+        # NVidia cross-OS
+        'cuda', 'cuvid', 'nvdec',
+        # NVidia Linux
+        'vdpau',
+        # AMD Windows
         'amf',
-        # Windows
-        'qsv', 'd3d11va', 'dxva2',
-        # Linux
-        'vaapi', 'vdpau', 'drm'],
+        # Intel Windows
+        'qsv',
+        # Linux, not GPU specific
+        'vaapi', 'drm',
+        # Windows, not GPU specific
+        'd3d11va', 'dxva2'],
     OUTPUT_FORMATS={
         'nvdec': 'cuda',
         'vaapi': 'vaapi'})