From 4a4890b5480889bc5dfb7d4478430a03a8ff5c2b Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Fri, 4 Oct 2019 10:23:43 +0200 Subject: [PATCH] fixed openh264 related issues, thx to mythos from IRC --- libfreerdp/codec/h264_openh264.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libfreerdp/codec/h264_openh264.c b/libfreerdp/codec/h264_openh264.c index 656ceef..aa1256e 100644 --- a/libfreerdp/codec/h264_openh264.c +++ b/libfreerdp/codec/h264_openh264.c @@ -362,7 +362,8 @@ static void openh264_uninit(H264_CONTEXT* h264) } #if defined (WITH_OPENH264_LOADING) - FreeLibrary(sysContexts->lib); + if (sysContexts->lib) + FreeLibrary(sysContexts->lib); #endif free(h264->pSystemData); h264->pSystemData = NULL; @@ -407,7 +408,7 @@ static BOOL openh264_load_functionpointers(H264_CONTEXT* h264, const char* name) sysContexts->version.uMinor, sysContexts->version.uRevision); - if ((sysContexts->version.uMajor < 1) || (sysContexts->version.uMinor < 6)) + if ((sysContexts->version.uMajor < 1) || ((sysContexts->version.uMajor == 1) && (sysContexts->version.uMinor < 6))) { WLog_Print(h264->log, WLOG_ERROR, "OpenH264 %s %d.%d.%d is too old, need at least version 1.6.0 for dynamic loading", -- 2.7.4