aboutsummaryrefslogtreecommitdiff
path: root/lib/DllAvCodec.h
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2014-01-11 01:25:27 +0100
committerRainer Hochecker <fernetmenta@online.de>2014-02-01 18:22:55 +0100
commit974a3c0e97b817ca358a959a026db95330673642 (patch)
treeff9258d87204494f938db56529bf9b5bcfe625f4 /lib/DllAvCodec.h
parente211654714b2266b80ba65361bda8f715d47933a (diff)
linux: link ffmpeg statically
Diffstat (limited to 'lib/DllAvCodec.h')
-rw-r--r--lib/DllAvCodec.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h
index 5cef736405..af13a15d52 100644
--- a/lib/DllAvCodec.h
+++ b/lib/DllAvCodec.h
@@ -94,7 +94,7 @@ public:
virtual AVDictionary* av_frame_get_metadata(const AVFrame* frame)=0;
};
-#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN)
+#if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) || (defined USE_STATIC_FFMPEG)
// Use direct layer
class DllAvCodec : public DllDynamic, DllAvCodecInterface
@@ -166,7 +166,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, "DllAvCodec: Using libavcodec system library");
#endif
return true;