[SCM] libav/experimental: fix dynamic loading of libfaad 2.6

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit dbbc573253bea762d6d3080f21cc487cf9d55e61
Author: Måns Rullgård <mans at mansr.com>
Date:   Thu Jan 24 19:51:29 2008 +0000

    fix dynamic loading of libfaad 2.6
    
    Originally committed as revision 11606 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/libfaad.c b/libavcodec/libfaad.c
index 6de8084..994caff 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 */

-- 
Libav/FFmpeg packaging