[osx/ios] fixed, log message is incorrect, darwin uses internal ffmpe…

…g but compiled static so it just looks like external
DDDamian · Sep 26, 2012 · 5e689c4 · 5e689c4
1 parent d2946b5
commit 5e689c4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 0 deletions.
diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h
@@ -177,7 +177,9 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
   // 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
@@ -147,7 +147,9 @@ class DllAvFilter : public DllDynamic, DllAvFilterInterface
   // 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
@@ -157,7 +157,9 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface
   // 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
@@ -159,7 +159,9 @@ class DllAvUtilBase : public DllDynamic, DllAvUtilInterface
    // 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
@@ -74,7 +74,9 @@ class DllSwResample : public DllDynamic, DllSwResampleInterface
   // 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 @@ class DllSwResample : public DllDynamic, DllSwResampleInterface
   // 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
@@ -116,7 +116,9 @@ class DllSwScale : public DllDynamic, public DllSwScaleInterface
   // 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() {}