diff faad.c @ 4336:b7caa9237018 libavcodec

Rename variables: faad --> libfaad, faac --> libfaac, faadbin --> libfaadbin
author diego
date Sat, 06 Jan 2007 23:54:01 +0000
parents 1e8621844040
children 7115a2f0854d
line wrap: on
line diff
--- a/faad.c	Sat Jan 06 23:44:48 2007 +0000
+++ b/faad.c	Sat Jan 06 23:54:01 2007 +0000
@@ -35,12 +35,12 @@
 #endif
 
 /*
- * when CONFIG_FAADBIN is defined the libfaad will be opened at runtime
+ * when CONFIG_LIBFAADBIN is defined the libfaad will be opened at runtime
  */
-//#undef CONFIG_FAADBIN
-//#define CONFIG_FAADBIN
+//#undef CONFIG_LIBFAADBIN
+//#define CONFIG_LIBFAADBIN
 
-#ifdef CONFIG_FAADBIN
+#ifdef CONFIG_LIBFAADBIN
 #include <dlfcn.h>
 static const char* libfaadname = "libfaad.so.0";
 #else
@@ -208,7 +208,7 @@
     FAACContext *s = (FAACContext *) avctx->priv_data;
     faacDecConfigurationPtr faac_cfg;
 
-#ifdef CONFIG_FAADBIN
+#ifdef CONFIG_LIBFAADBIN
     const char* err = 0;
 
     s->handle = dlopen(libfaadname, RTLD_LAZY);
@@ -222,9 +222,9 @@
     do { static const char* n = "faacDec" #a; \
     if ((s->faacDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0)
     for(;;) {
-#else  /* !CONFIG_FAADBIN */
+#else  /* !CONFIG_LIBFAADBIN */
 #define dfaac(a, b)     s->faacDec ## a = faacDec ## a
-#endif /* CONFIG_FAADBIN */
+#endif /* CONFIG_LIBFAADBIN */
 
         // resolve all needed function calls
         dfaac(Open, (faacDecHandle FAADAPI (*)(void)));
@@ -256,7 +256,7 @@
 #endif
 #undef dfacc
 
-#ifdef CONFIG_FAADBIN
+#ifdef CONFIG_LIBFAADBIN
         break;
     }
     if (err) {