fixed openh264 related issues, thx to mythos from IRC

diff --git a/libfreerdp/codec/h264_openh264.c b/libfreerdp/codec/h264_openh264.c
index 656ceef..aa1256e 100644 (file)
--- 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",