diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-17 20:03:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-17 20:03:16 +0200 |
| commit | 67ac31d1bec2c670bf13a12e04b201a2909a6a1a (patch) | |
| tree | 2cb45c184e9c2b593afef987dfb182eb04440102 | |
| parent | 12da8bc38dca53119d44cbbefad0a2b24dc551f5 (diff) | |
| parent | 247aa7af7d8197247c181e3fbfe8d93d75e41b29 (diff) | |
| download | ffmpeg-67ac31d1bec2c670bf13a12e04b201a2909a6a1a.tar.gz | |
Merge commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29'
* commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29':
avisynth: Simplify shared library name construction
Conflicts:
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avisynth.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 4af58f62f7..7dc5ee7df6 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -22,6 +22,7 @@ #include "libavcodec/internal.h" #include "avformat.h" #include "internal.h" +#include "config.h" /* Enable function pointer definitions for runtime loading. */ #define AVSC_NO_DECLSPEC @@ -36,11 +37,8 @@ #else #include <dlfcn.h> #include "compat/avisynth/avxsynth_c.h" - #if defined (__APPLE__) - #define AVISYNTH_LIB "libavxsynth.dylib" - #else - #define AVISYNTH_LIB "libavxsynth.so" - #endif + #define AVISYNTH_NAME "libavxsynth" + #define AVISYNTH_LIB AVISYNTH_NAME SLIBSUF #define LoadLibrary(x) dlopen(x, RTLD_NOW | RTLD_LOCAL) #define GetProcAddress dlsym |