diff options
| author | jmarshallnz <jcmarsha@gmail.com> | 2014-04-12 09:03:23 +1200 |
|---|---|---|
| committer | Trent Nelson <trent.a.b.nelson@gmail.com> | 2014-04-15 12:16:34 -0600 |
| commit | 09f9d1cdc21136d46722837ab4fcf27c6f41917b (patch) | |
| tree | f630516f6efc6aaa6a863a8c1d74706d2dedef9c /lib | |
| parent | 8e2f053812c34eb8c7a0b4d09108b9033214a295 (diff) | |
Merge pull request #4548 from wsnipex/logging-fix
fix incorrect logging when using static ffmpeg
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/DllAvFilter.h | 2 | ||||
| -rw-r--r-- | lib/DllPostProc.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h index 05e5c6f734..6ef603a969 100644 --- a/lib/DllAvFilter.h +++ b/lib/DllAvFilter.h @@ -174,7 +174,7 @@ public: // DLL faking. virtual bool ResolveExports() { return true; } virtual bool Load() { -#if !defined(TARGET_DARWIN) +#if !defined(TARGET_DARWIN) && !defined(USE_STATIC_FFMPEG) CLog::Log(LOGDEBUG, "DllAvFilter: Using libavfilter system library"); #endif return true; diff --git a/lib/DllPostProc.h b/lib/DllPostProc.h index e9542eb0b3..ebba5e2f41 100644 --- a/lib/DllPostProc.h +++ b/lib/DllPostProc.h @@ -97,7 +97,9 @@ public: // DLL faking. virtual bool ResolveExports() { return true; } virtual bool Load() { +#if !defined(TARGET_DARWIN) && !defined(USE_STATIC_FFMPEG) CLog::Log(LOGDEBUG, "DllPostProc: Using libpostproc system library"); +#endif return true; } virtual void Unload() {} |