comparison libfaad.c @ 6174:3544e992b60b libavcodec

fix dynamic loading of libfaad 2.6
author mru
date Thu, 24 Jan 2008 19:51:29 +0000
parents 49d225414a3f
children 843555383499
comparison
equal deleted inserted replaced
6173:11d2976cddc4 6174:3544e992b60b
40 //#undef CONFIG_LIBFAADBIN 40 //#undef CONFIG_LIBFAADBIN
41 //#define CONFIG_LIBFAADBIN 41 //#define CONFIG_LIBFAADBIN
42 42
43 #ifdef CONFIG_LIBFAADBIN 43 #ifdef CONFIG_LIBFAADBIN
44 #include <dlfcn.h> 44 #include <dlfcn.h>
45 static const char* libfaadname = "libfaad.so.0"; 45 static const char* libfaadname = "libfaad.so";
46 #else 46 #else
47 #define dlopen(a) 47 #define dlopen(a)
48 #define dlclose(a) 48 #define dlclose(a)
49 #endif 49 #endif
50 50
233 av_log(avctx, AV_LOG_ERROR, "FAAD library: %s could not be opened! \n%s\n", 233 av_log(avctx, AV_LOG_ERROR, "FAAD library: %s could not be opened! \n%s\n",
234 libfaadname, dlerror()); 234 libfaadname, dlerror());
235 return -1; 235 return -1;
236 } 236 }
237 #define dfaac(a, b) \ 237 #define dfaac(a, b) \
238 do { static const char* n = "faacDec" #a; \ 238 do { static const char* n = AV_STRINGIFY(faacDec ## a); \
239 if ((s->faacDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0) 239 if ((s->faacDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0)
240 for(;;) { 240 for(;;) {
241 #else /* !CONFIG_LIBFAADBIN */ 241 #else /* !CONFIG_LIBFAADBIN */
242 #define dfaac(a, b) s->faacDec ## a = faacDec ## a 242 #define dfaac(a, b) s->faacDec ## a = faacDec ## a
243 #endif /* CONFIG_LIBFAADBIN */ 243 #endif /* CONFIG_LIBFAADBIN */