summaryrefslogtreecommitdiffstats
path: root/wscript_build.py
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-05-11 14:37:03 +0200
committerwm4 <wm4@nowhere>2016-05-11 15:40:31 +0200
commitfd82e14888ae2fb1a7430e1166a048dc03321d49 (patch)
tree28ffc9b123bf4dbeb8218181d74d4963836fb0d5 /wscript_build.py
parentfde20d10bcacebf61aff42ab1f48ac72023a2aa5 (diff)
downloadmpv-fd82e14888ae2fb1a7430e1166a048dc03321d49.tar.bz2
mpv-fd82e14888ae2fb1a7430e1166a048dc03321d49.tar.xz
build: merge d3d11va and dxva2 hwaccel checks
We don't have any reason to disable either. Both are loaded dynamically at runtime anyway. There is also no reason why dxva2 would disappear from libavcodec any time soon.
Diffstat (limited to 'wscript_build.py')
-rw-r--r--wscript_build.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/wscript_build.py b/wscript_build.py
index 66f733a182..9335f05cb4 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -286,13 +286,13 @@ def build(ctx):
( "video/mp_image.c" ),
( "video/mp_image_pool.c" ),
( "video/sws_utils.c" ),
- ( "video/dxva2.c", "dxva2-hwaccel" ),
+ ( "video/dxva2.c", "d3d-hwaccel" ),
( "video/vaapi.c", "vaapi" ),
( "video/vdpau.c", "vdpau" ),
( "video/vdpau_mixer.c", "vdpau" ),
( "video/decode/dec_video.c"),
- ( "video/decode/dxva2.c", "dxva2-hwaccel" ),
- ( "video/decode/d3d11va.c", "d3d11va-hwaccel" ),
+ ( "video/decode/dxva2.c", "d3d-hwaccel" ),
+ ( "video/decode/d3d11va.c", "d3d-hwaccel" ),
( "video/decode/d3d.c", "d3d-hwaccel" ),
( "video/decode/vaapi.c", "vaapi-hwaccel" ),
( "video/decode/vd_lavc.c" ),