Skip to content

F
ffmpeg.wasm-core
Commit dbbc5732 authored by Måns Rullgård's avatar Måns Rullgård
Browse files
Options

fix dynamic loading of libfaad 2.6 

Originally committed as revision 11606 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cb077b7a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/libfaad.c
View file @ dbbc5732
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#ifdef CONFIG_LIBFAADBIN #ifdef CONFIG_LIBFAADBIN
#include <dlfcn.h> #include <dlfcn.h>
static const char* libfaadname = "libfaad.so.0"; static const char* libfaadname = "libfaad.so";
#else #else
#define dlopen(a) #define dlopen(a)
#define dlclose(a) #define dlclose(a)
...@@ -235,7 +235,7 @@ static int faac_decode_init(AVCodecContext *avctx) ...@@ -235,7 +235,7 @@ static int faac_decode_init(AVCodecContext *avctx)
return -1; return -1;
} }
#define dfaac(a, b) \ #define dfaac(a, b) \
do { static const char* n = "faacDec" #a; \ do { static const char* n = AV_STRINGIFY(faacDec ## a); \
if ((s->faacDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0) if ((s->faacDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0)
for(;;) { for(;;) {
#else /* !CONFIG_LIBFAADBIN */ #else /* !CONFIG_LIBFAADBIN */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment