vlc | branch: master | Steve Lhomme <[email protected]> | Mon Jun 15 07:29:29 2020 +0200| [4ed6b017622b9240b438b96b0cf607ba823ccde2] | committer: Steve Lhomme
dxva: rename blacklist to blocklist > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4ed6b017622b9240b438b96b0cf607ba823ccde2 --- modules/codec/Makefile.am | 4 ++-- modules/codec/avcodec/d3d11va.c | 2 +- modules/codec/avcodec/dxva2.c | 2 +- modules/codec/avcodec/{dxva_blacklist.c => dxva_blocklist.c} | 0 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am index 149b1bffcc..dc0bda07dc 100644 --- a/modules/codec/Makefile.am +++ b/modules/codec/Makefile.am @@ -412,7 +412,7 @@ libdxva2_plugin_la_SOURCES = \ codec/avcodec/va_surface.c codec/avcodec/va_surface.h \ packetizer/h264_nal.c packetizer/h264_nal.h \ packetizer/hevc_nal.c packetizer/hevc_nal.h \ - codec/avcodec/dxva_blacklist.c + codec/avcodec/dxva_blocklist.c libdxva2_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) -lshlwapi -luuid if !HAVE_WINSTORE if HAVE_AVCODEC_DXVA2 @@ -432,7 +432,7 @@ libd3d11va_plugin_la_SOURCES = \ codec/avcodec/va_surface.c codec/avcodec/va_surface.h \ packetizer/h264_nal.c packetizer/h264_nal.h \ packetizer/hevc_nal.c packetizer/hevc_nal.h \ - codec/avcodec/dxva_blacklist.c + codec/avcodec/dxva_blocklist.c libd3d11va_plugin_la_LIBADD = libd3d11_common.la $(LIBCOM) -luuid if HAVE_WINSTORE libd3d11va_plugin_la_LIBADD += -ld3d11 diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c index b185a49139..aaa41fcd73 100644 --- a/modules/codec/avcodec/d3d11va.c +++ b/modules/codec/avcodec/d3d11va.c @@ -415,7 +415,7 @@ static int DxSetupOutput(vlc_va_t *va, const directx_va_mode_t *mode, const vide if (!directx_va_canUseDecoder(va, sys->d3d_dev->adapterDesc.VendorId, sys->d3d_dev->adapterDesc.DeviceId, mode->guid, sys->d3d_dev->WDDM.build)) { - msg_Warn(va, "GPU blacklisted for %s codec", mode->name); + msg_Warn(va, "GPU blocklisted for %s codec", mode->name); return VLC_EGENERIC; } diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c index 22afad5352..aefcb55497 100644 --- a/modules/codec/avcodec/dxva2.c +++ b/modules/codec/avcodec/dxva2.c @@ -446,7 +446,7 @@ static int DxSetupOutput(vlc_va_t *va, const directx_va_mode_t *mode, const vide if (!directx_va_canUseDecoder(va, identifier->VendorId, identifier->DeviceId, mode->guid, driverBuild)) { - msg_Warn(va, "GPU blacklisted for %s codec", mode->name); + msg_Warn(va, "GPU blocklisted for %s codec", mode->name); return VLC_EGENERIC; } diff --git a/modules/codec/avcodec/dxva_blacklist.c b/modules/codec/avcodec/dxva_blocklist.c similarity index 100% rename from modules/codec/avcodec/dxva_blacklist.c rename to modules/codec/avcodec/dxva_blocklist.c _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
