aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorS. Davilla <davilla@4pi.com>2012-09-26 10:28:04 -0400
committerS. Davilla <davilla@4pi.com>2012-09-26 11:10:25 -0400
commit5e689c4b32bb12ea7066ea0cca04c7b36d32756e (patch)
treec28c05cd306b5050ac5c09fb7cc7b44e9dec5737
parentd2946b59c9a82858c9e4e3c0ad62c5c48ddc538d (diff)
[osx/ios] fixed, log message is incorrect, darwin uses internal ffmpeg but compiled static so it just looks like external
-rw-r--r--lib/DllAvCodec.h2
-rw-r--r--lib/DllAvFilter.h2
-rw-r--r--lib/DllAvFormat.h2
-rw-r--r--lib/DllAvUtil.h2
-rw-r--r--lib/DllSwResample.h4
-rw-r--r--lib/DllSwScale.h2
6 files changed, 14 insertions, 0 deletions
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() {}