From a95711993837fbcf9e2924ab390190512f1890cb Mon Sep 17 00:00:00 2001 From: rigaya Date: Thu, 2 May 2024 18:24:50 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mppcore/rgy_input_vpy.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mppcore/rgy_input_vpy.cpp b/mppcore/rgy_input_vpy.cpp index 16c578d..61e5c93 100644 --- a/mppcore/rgy_input_vpy.cpp +++ b/mppcore/rgy_input_vpy.cpp @@ -74,12 +74,6 @@ void RGYInputVpy::release_vapoursynth() { memset(&m_sVS, 0, sizeof(m_sVS)); } -#if defined(_WIN32) || defined(_WIN64) -static const TCHAR *vsscript_dll_name = _T("vsscript.dll"); -#else -static const TCHAR *vsscript_dll_name = _T("libvapoursynth-script.so"); -#endif - int RGYInputVpy::load_vapoursynth(const tstring& vapoursynthpath) { release_vapoursynth(); @@ -96,8 +90,8 @@ int RGYInputVpy::load_vapoursynth(const tstring& vapoursynthpath) { if (NULL == (m_sVS.hVSScriptDLL = RGY_LOAD_LIBRARY(vpy_dll_target))) { #else //VapourSynthを介してpython3のsoをロードするにはdlopenにRTLD_GLOBALが必要。 - const TCHAR *vsscript_dll_name = _T("libvapoursynth-script.so"); - if (NULL == (m_sVS.hVSScriptDLL = vsscript(vpy_dll_target, RTLD_LAZY|RTLD_GLOBAL))) { + const TCHAR *vpy_dll_target = _T("libvapoursynth-script.so"); + if (NULL == (m_sVS.hVSScriptDLL = dlopen(vpy_dll_target, RTLD_LAZY|RTLD_GLOBAL))) { #endif AddMessage(RGY_LOG_ERROR, _T("Failed to load %s.\n"), vpy_dll_target); return 1;