shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #45 from mstorsjo/no-libdl

Avoid all calls to libdl (or equivalent) if NO_DYNAMIC_VP is defined

--- a/codec/encoder/core/src/wels_preprocess.cpp

+++ b/codec/encoder/core/src/wels_preprocess.cpp

@@ -141,6 +141,7 @@

 void* CWelsLib::QueryFunction (const str_t* pName) {

   void* pFunc = NULL;

+#ifndef NO_DYNAMIC_VP

   if (m_pVpLib) {

 #if defined(WIN32)

     HMODULE shModule = (HMODULE)m_pVpLib;

@@ -157,6 +158,7 @@

       printf ("dlsym %s iRet=%p, err=%s\n", shModule, pFunc, dlerror());

 #endif

   }

+#endif

   return pFunc;

 }

--- a/codec/encoder/plus/src/welsCodecTrace.cpp

+++ b/codec/encoder/plus/src/welsCodecTrace.cpp

@@ -242,6 +242,7 @@

 }

 welsCodecTrace::~welsCodecTrace() {

+#ifndef NO_DYNAMIC_VP

 #if defined WIN32

   if (m_hTraceHandle) {

     ::FreeLibrary ((HMODULE)m_hTraceHandle);

@@ -254,6 +255,7 @@

   if (m_hTraceHandle) {

     ::dlclose (m_hTraceHandle);

   }

+#endif

 #endif

   m_hTraceHandle = NULL;