changeset 6174:3544e992b60b libavcodec

fix dynamic loading of libfaad 2.6
author mru
date Thu, 24 Jan 2008 19:51:29 +0000
parents 11d2976cddc4
children 843555383499
files libfaad.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libfaad.c	Thu Jan 24 19:31:59 2008 +0000
+++ b/libfaad.c	Thu Jan 24 19:51:29 2008 +0000
@@ -42,7 +42,7 @@
 
 #ifdef CONFIG_LIBFAADBIN
 #include <dlfcn.h>
-static const char* libfaadname = "libfaad.so.0";
+static const char* libfaadname = "libfaad.so";
 #else
 #define dlopen(a)
 #define dlclose(a)
@@ -235,7 +235,7 @@
         return -1;
     }
 #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)
     for(;;) {
 #else  /* !CONFIG_LIBFAADBIN */