Merge commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Apr 2015 18:03:16 +0000 (20:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Apr 2015 18:03:16 +0000 (20:03 +0200)
* commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29':
  avisynth: Simplify shared library name construction

Conflicts:
libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/avisynth.c

    #define USING_AVISYNTH
  #else
    #include <dlfcn.h>
 -  #include <avxsynth/avxsynth_c.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