From 17c5738cb43382831407400312f0f0d4989d115c Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 28 Jun 2016 20:04:16 +0200 Subject: d3d: merge angle_common.h into d3d.h OK, this was dumb. The file didn't have much to do with ANGLE, and the functionality can simply be moved to d3d.c. That file contains helpers for decoding, but can always be present (on Windows) since it doesn't access any D3D specific libavcodec APIs. Thus it doesn't need to be conditionally built like the actual hwaccel wrappers. --- wscript_build.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'wscript_build.py') diff --git a/wscript_build.py b/wscript_build.py index 54518b3861..8f2b85c787 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -288,7 +288,7 @@ def build(ctx): ( "video/decode/dec_video.c"), ( "video/decode/dxva2.c", "d3d-hwaccel" ), ( "video/decode/d3d11va.c", "d3d-hwaccel" ), - ( "video/decode/d3d.c", "d3d-hwaccel" ), + ( "video/decode/d3d.c", "win32" ), ( "video/decode/vaapi.c", "vaapi-hwaccel" ), ( "video/decode/vd_lavc.c" ), ( "video/decode/videotoolbox.c", "videotoolbox-hwaccel" ), @@ -327,7 +327,6 @@ def build(ctx): ( "video/out/dither.c" ), ( "video/out/filter_kernels.c" ), ( "video/out/opengl/angle_dynamic.c", "egl-angle" ), - ( "video/out/opengl/angle_common.c", "egl-angle" ), ( "video/out/opengl/common.c", "gl" ), ( "video/out/opengl/context.c", "gl" ), ( "video/out/opengl/context_angle.c", "egl-angle" ), -- cgit v1.2.3