diff --git a/media-playback/media.cpp b/media-playback/media.cpp index a228ee4..d4696ab 100644 --- a/media-playback/media.cpp +++ b/media-playback/media.cpp @@ -911,7 +911,7 @@ bool mp_media_init(mp_media_t *media, const struct mp_media_info *info) media->buffering = info->buffering; media->speed = info->speed; media->is_local_file = info->is_local_file; - media->read_buffer = reinterpret_cast(av_malloc(READ_BUFFER_SIZE)); + media->read_buffer = static_cast(av_malloc(READ_BUFFER_SIZE)); da_init(media->packet_pool); if (!info->is_local_file || media->speed < 1 || media->speed > 200) diff --git a/streamlink-delayload.cpp b/streamlink-delayload.cpp index 20773c3..8a3d60a 100644 --- a/streamlink-delayload.cpp +++ b/streamlink-delayload.cpp @@ -15,7 +15,12 @@ FARPROC WINAPI obs_streamlink_delay_load(unsigned dliNotify, PDelayLoadInfo pdli auto pathFFmpeg = obs_streamlink_data_path / "ffmpeg" / pdli->szDll; auto pathPython = obs_streamlink_data_path / obs_streamlink_python_ver / pdli->szDll; if (exists(pathFFmpeg)) - return reinterpret_cast(LoadLibraryW(pathFFmpeg.wstring().c_str())); + { + auto directLoad = LoadLibraryA(pdli->szDll); + if (!directLoad) + return reinterpret_cast(LoadLibraryW(pathFFmpeg.wstring().c_str())); + return reinterpret_cast(directLoad); + } if (exists(pathPython)) return reinterpret_cast(LoadLibraryW(pathPython.wstring().c_str())); }