From 9850932722eb252fcf685080f14edd8b10c8685e Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Jan 2017 08:11:12 +0100 Subject: [PATCH] build: prefix hwaccel decoder wrapper filenames with hw_ Should have done this a long time ago. d3d.c remains as it is, because it's just a bunch of helper functions. --- video/decode/{cuda.c => hw_cuda.c} | 0 video/decode/{d3d11va.c => hw_d3d11va.c} | 0 video/decode/{dxva2.c => hw_dxva2.c} | 0 video/decode/{vaapi.c => hw_vaapi.c} | 0 video/decode/{vaapi_old.c => hw_vaapi_old.c} | 0 video/decode/{vdpau.c => hw_vdpau.c} | 0 .../decode/{videotoolbox.c => hw_videotoolbox.c} | 0 wscript_build.py | 16 ++++++++-------- 8 files changed, 8 insertions(+), 8 deletions(-) rename video/decode/{cuda.c => hw_cuda.c} (100%) rename video/decode/{d3d11va.c => hw_d3d11va.c} (100%) rename video/decode/{dxva2.c => hw_dxva2.c} (100%) rename video/decode/{vaapi.c => hw_vaapi.c} (100%) rename video/decode/{vaapi_old.c => hw_vaapi_old.c} (100%) rename video/decode/{vdpau.c => hw_vdpau.c} (100%) rename video/decode/{videotoolbox.c => hw_videotoolbox.c} (100%) diff --git a/video/decode/cuda.c b/video/decode/hw_cuda.c similarity index 100% rename from video/decode/cuda.c rename to video/decode/hw_cuda.c diff --git a/video/decode/d3d11va.c b/video/decode/hw_d3d11va.c similarity index 100% rename from video/decode/d3d11va.c rename to video/decode/hw_d3d11va.c diff --git a/video/decode/dxva2.c b/video/decode/hw_dxva2.c similarity index 100% rename from video/decode/dxva2.c rename to video/decode/hw_dxva2.c diff --git a/video/decode/vaapi.c b/video/decode/hw_vaapi.c similarity index 100% rename from video/decode/vaapi.c rename to video/decode/hw_vaapi.c diff --git a/video/decode/vaapi_old.c b/video/decode/hw_vaapi_old.c similarity index 100% rename from video/decode/vaapi_old.c rename to video/decode/hw_vaapi_old.c diff --git a/video/decode/vdpau.c b/video/decode/hw_vdpau.c similarity index 100% rename from video/decode/vdpau.c rename to video/decode/hw_vdpau.c diff --git a/video/decode/videotoolbox.c b/video/decode/hw_videotoolbox.c similarity index 100% rename from video/decode/videotoolbox.c rename to video/decode/hw_videotoolbox.c diff --git a/wscript_build.py b/wscript_build.py index 9e213e824e..56006f3169 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -302,16 +302,16 @@ def build(ctx): ( "video/vaapi.c", "vaapi" ), ( "video/vdpau.c", "vdpau" ), ( "video/vdpau_mixer.c", "vdpau" ), - ( "video/decode/dec_video.c"), - ( "video/decode/cuda.c", "cuda-hwaccel" ), - ( "video/decode/dxva2.c", "d3d-hwaccel" ), - ( "video/decode/d3d11va.c", "d3d-hwaccel" ), ( "video/decode/d3d.c", "win32" ), - ( "video/decode/vaapi.c", "vaapi-hwaccel-new" ), - ( "video/decode/vaapi_old.c", "vaapi-hwaccel-old" ), + ( "video/decode/dec_video.c"), + ( "video/decode/hw_cuda.c", "cuda-hwaccel" ), + ( "video/decode/hw_dxva2.c", "d3d-hwaccel" ), + ( "video/decode/hw_d3d11va.c", "d3d-hwaccel" ), + ( "video/decode/hw_vaapi.c", "vaapi-hwaccel-new" ), + ( "video/decode/hw_vaapi_old.c", "vaapi-hwaccel-old" ), + ( "video/decode/hw_vdpau.c", "vdpau-hwaccel" ), + ( "video/decode/hw_videotoolbox.c", "videotoolbox-hwaccel" ), ( "video/decode/vd_lavc.c" ), - ( "video/decode/videotoolbox.c", "videotoolbox-hwaccel" ), - ( "video/decode/vdpau.c", "vdpau-hwaccel" ), ( "video/filter/refqueue.c" ), ( "video/filter/vf.c" ), ( "video/filter/vf_buffer.c" ),