mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5643 from akallabeth/openh264_fixes

Browse Source 
fixed openh264 related issues, thx to mythos from IRC
This commit is contained in:
Martin Fleisz 2019-10-04 11:23:29 +02:00 committed by GitHub
commit 1c6aa52150
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libfreerdp/codec/h264_openh264.c
View File

@ -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",