highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29'

Browse Source 
* commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29':
  avisynth: Simplify shared library name construction

Conflicts:
	libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-04-17 20:03:16 +02:00
parent 12da8bc38d 247aa7af7d
commit 67ac31d1be
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/avisynth.c
View File

@@ -22,6 +22,7 @@
#include "libavcodec/internal.h" #include "libavcodec/internal.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "config.h"
/* Enable function pointer definitions for runtime loading. */ /* Enable function pointer definitions for runtime loading. */
#define AVSC_NO_DECLSPEC #define AVSC_NO_DECLSPEC
@@ -36,11 +37,8 @@
#else #else
#include <dlfcn.h> #include <dlfcn.h>
#include "compat/avisynth/avxsynth_c.h" #include "compat/avisynth/avxsynth_c.h"
#if defined (__APPLE__) #define AVISYNTH_NAME "libavxsynth"
#define AVISYNTH_LIB "libavxsynth.dylib" #define AVISYNTH_LIB AVISYNTH_NAME SLIBSUF
#else
#define AVISYNTH_LIB "libavxsynth.so"
#endif
#define LoadLibrary(x) dlopen(x, RTLD_NOW | RTLD_LOCAL) #define LoadLibrary(x) dlopen(x, RTLD_NOW | RTLD_LOCAL)
#define GetProcAddress dlsym #define GetProcAddress dlsym