summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2008-01-24 19:51:29 +0000
committerMåns Rullgård <mans@mansr.com>2008-01-24 19:51:29 +0000
commitdbbc573253bea762d6d3080f21cc487cf9d55e61 (patch)
tree027d377b22d6a1844018df77072b659546eedc4f /libavcodec
parentcb077b7aa319caf4a11e811df93b1c2b86fff954 (diff)
fix dynamic loading of libfaad 2.6
Originally committed as revision 11606 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/libfaad.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libfaad.c b/libavcodec/libfaad.c
index 6de8084334..994caff787 100644
--- a/libavcodec/libfaad.c
+++ b/libavcodec/libfaad.c
@@ -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 @@ static int faac_decode_init(AVCodecContext *avctx)
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 */