From 5e689c4b32bb12ea7066ea0cca04c7b36d32756e Mon Sep 17 00:00:00 2001 From: "S. Davilla" Date: Wed, 26 Sep 2012 10:28:04 -0400 Subject: [osx/ios] fixed, log message is incorrect, darwin uses internal ffmpeg but compiled static so it just looks like external --- lib/DllAvCodec.h | 2 ++ lib/DllAvFilter.h | 2 ++ lib/DllAvFormat.h | 2 ++ lib/DllAvUtil.h | 2 ++ lib/DllSwResample.h | 4 ++++ lib/DllSwScale.h | 2 ++ 6 files changed, 14 insertions(+) (limited to 'lib') diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h index 752d36a4f2..db007a1a48 100644 --- a/lib/DllAvCodec.h +++ b/lib/DllAvCodec.h @@ -177,7 +177,9 @@ public: // DLL faking. virtual bool ResolveExports() { return true; } virtual bool Load() { +#if !defined(TARGET_DARWIN) CLog::Log(LOGDEBUG, "DllAvCodec: Using libavcodec system library"); +#endif return true; } virtual void Unload() {} diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h index de6f4c0c51..1ae06b98a6 100644 --- a/lib/DllAvFilter.h +++ b/lib/DllAvFilter.h @@ -147,7 +147,9 @@ public: // DLL faking. virtual bool ResolveExports() { return true; } virtual bool Load() { +#if !defined(TARGET_DARWIN) CLog::Log(LOGDEBUG, "DllAvFilter: Using libavfilter system library"); +#endif return true; } virtual void Unload() {} diff --git a/lib/DllAvFormat.h b/lib/DllAvFormat.h index 67c4282703..9bda3f34b1 100644 --- a/lib/DllAvFormat.h +++ b/lib/DllAvFormat.h @@ -157,7 +157,9 @@ public: // DLL faking. virtual bool ResolveExports() { return true; } virtual bool Load() { +#if !defined(TARGET_DARWIN) CLog::Log(LOGDEBUG, "DllAvFormat: Using libavformat system library"); +#endif return true; } virtual void Unload() {} diff --git a/lib/DllAvUtil.h b/lib/DllAvUtil.h index 06125ecb08..b39566dec0 100644 --- a/lib/DllAvUtil.h +++ b/lib/DllAvUtil.h @@ -159,7 +159,9 @@ public: // DLL faking. virtual bool ResolveExports() { return true; } virtual bool Load() { +#if !defined(TARGET_DARWIN) CLog::Log(LOGDEBUG, "DllAvUtilBase: Using libavutil system library"); +#endif return true; } virtual void Unload() {} diff --git a/lib/DllSwResample.h b/lib/DllSwResample.h index 05beab6a64..30ee08d6e8 100644 --- a/lib/DllSwResample.h +++ b/lib/DllSwResample.h @@ -74,7 +74,9 @@ public: // DLL faking. virtual bool ResolveExports() { return true; } virtual bool Load() { +#if !defined(TARGET_DARWIN) CLog::Log(LOGDEBUG, "DllAvFormat: Using libswresample system library"); +#endif return true; } virtual void Unload() {} @@ -93,7 +95,9 @@ public: // DLL faking. virtual bool ResolveExports() { return true; } virtual bool Load() { +#if !defined(TARGET_DARWIN) CLog::Log(LOGDEBUG, "DllAvFormat: Using libavresample system library"); +#endif return true; } virtual void Unload() {} diff --git a/lib/DllSwScale.h b/lib/DllSwScale.h index 0fe8184b94..0114bb8783 100644 --- a/lib/DllSwScale.h +++ b/lib/DllSwScale.h @@ -116,7 +116,9 @@ public: // DLL faking. virtual bool ResolveExports() { return true; } virtual bool Load() { +#if !defined(TARGET_DARWIN) CLog::Log(LOGDEBUG, "DllSwScale: Using libswscale system library"); +#endif return true; } virtual void Unload() {} -- cgit v1.2.3