Rename variables: faad --> libfaad, faac --> libfaac, faadbin --> libfaadbin

Originally committed as revision 7416 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index b3ddeeb..92dd7e4 100755 (executable)
--- a/configure
+++ b/configure
@@ -418,9 +418,6 @@ CONFIG_LIST='
     bktr
     dc1394
     dv1394
-    faac
-    faad
-    faadbin
     ffmpeg
     ffplay
     ffserver
@@ -429,6 +426,9 @@ CONFIG_LIST='
     liba52
     liba52bin
     libdts
+    libfaac
+    libfaad
+    libfaadbin
     libgsm
     libnut
     libogg
@@ -592,15 +592,15 @@ ipv6="yes"
 zlib="yes"
 liba52="no"
 liba52bin="no"
+libfaac="no"
+libfaad="no"
+libfaadbin="no"
 libgsm="no"
 mp3lame="no"
 libdts="no"
 libnut="no"
 libogg="no"
 libvorbis="no"
-faad="no"
-faadbin="no"
-faac="no"
 xvid="no"
 x264="no"
 pp="no"
@@ -954,11 +954,11 @@ for opt do
   --enable-vorbis) libvorbis="yes"
     pkg_requires="$pkg_requires vorbis vorbisenc"
   ;;
-  --enable-faad) faad="yes"
+  --enable-faad) libfaad="yes"
   ;;
-  --enable-faadbin) faadbin="yes"
+  --enable-faadbin) libfaadbin="yes"
   ;;
-  --enable-faac) faac="yes"
+  --enable-faac) libfaac="yes"
   ;;
   --enable-xvid) xvid="yes"
   ;;
@@ -1148,7 +1148,7 @@ if test "$gpl" != "yes"; then
         die "libdts is under GPL and --enable-gpl is not specified."
     fi
 
-    if test "$faad" != "no" -o "$faadbin" != "no"; then
+    if test "$libfaad" != "no" -o "$libfaadbin" != "no"; then
         if check_header faad.h; then
             check_cc << EOF
                 #include <faad.h>
@@ -1161,8 +1161,8 @@ EOF
                 die "FAAD2 is under GPL and --enable-gpl is not specified."
             fi
         else
-            faad="no"
-            faadbin="no"
+            libfaad="no"
+            libfaadbin="no"
             echo "FAAD test failed."
         fi
     fi
@@ -1474,9 +1474,9 @@ enabled x264    && require x264 x264.h x264_encoder_open -lx264
 enabled dc1394  && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394
 enabled mlib    && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
 
-# Ugh, faac uses stdcall calling convention on win32 so we can't use
+# Ugh, libfaac uses stdcall calling convention on win32 so we can't use
 # the generic test functions
-if enabled faac; then
+if enabled libfaac; then
     save_flags
     temp_extralibs -lfaac
     check_ld <<EOF && add_extralibs -lfaac || die "ERROR: libfaac not found"
@@ -1493,7 +1493,7 @@ fi
 
 # Ugh, recent faad2 versions have renamed all functions and #define the
 # old names in faad.h.  Generic tests won't work.
-if enabled faad; then
+if enabled libfaad; then
     save_flags
     temp_extralibs -lfaad
     check_ld <<EOF && add_extralibs -lfaad || die "ERROR: libfaad not found"
@@ -1550,7 +1550,7 @@ if test "$vhook" = "default"; then
     vhook="$dlopen"
 fi
 
-if enabled_any vhook liba52bin faadbin; then
+if enabled_any vhook liba52bin libfaadbin; then
     add_extralibs $ldl
 fi
 
@@ -1795,9 +1795,9 @@ echo "AVISynth enabled          $avisynth"
 echo "liba52 support            $liba52"
 echo "liba52 dlopened           $liba52bin"
 echo "libdts support            $libdts"
-echo "libfaac enabled           $faac"
-echo "libfaad enabled           $faad"
-echo "faadbin enabled           $faadbin"
+echo "libfaac enabled           $libfaac"
+echo "libfaad enabled           $libfaad"
+echo "faadbin enabled           $libfaadbin"
 echo "libgsm enabled            $libgsm"
 echo "libmp3lame enabled        $mp3lame"
 echo "libnut enabled            $libnut"

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 7ee2e86..9bf27d3 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -243,8 +243,8 @@ OBJS-$(CONFIG_ADPCM_XA_ENCODER)        += adpcm.o
 OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER)    += adpcm.o
 OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)    += adpcm.o
 
-OBJS-$(CONFIG_FAAD)                    += faad.o
-OBJS-$(CONFIG_FAAC)                    += faac.o
+OBJS-$(CONFIG_LIBFAAD)                 += faad.o
+OBJS-$(CONFIG_LIBFAAC)                 += faac.o
 OBJS-$(CONFIG_XVID)                    += xvidff.o xvid_rc.o
 OBJS-$(CONFIG_X264)                    += x264.o
 OBJS-$(CONFIG_MP3LAME)                 += mp3lameaudio.o

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index f211a1a..ce9df7f 100644 (file)
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -160,7 +160,7 @@ void avcodec_register_all(void)
 #endif
 
     /* audio codecs */
-#ifdef CONFIG_FAAD
+#ifdef CONFIG_LIBFAAD
     REGISTER_DECODER(AAC, aac);
     REGISTER_DECODER(MPEG4AAC, mpeg4aac);
 #endif
@@ -180,7 +180,7 @@ void avcodec_register_all(void)
 #ifdef CONFIG_LIBDTS
     REGISTER_DECODER(DTS, dts);
 #endif
-#ifdef CONFIG_FAAC
+#ifdef CONFIG_LIBFAAC
     REGISTER_ENCODER(FAAC, faac);
 #endif
     REGISTER_ENCDEC (FLAC, flac);

diff --git a/libavcodec/faad.c b/libavcodec/faad.c
index df33ea0..80e5e0b 100644 (file)
--- a/libavcodec/faad.c
+++ b/libavcodec/faad.c
@@ -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 @@ static int faac_decode_init(AVCodecContext *avctx)
     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 @@ static int faac_decode_init(AVCodecContext *avctx)
     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 @@ static int faac_decode_init(AVCodecContext *avctx)
 #endif
 #undef dfacc
 
-#ifdef CONFIG_FAADBIN
+#ifdef CONFIG_LIBFAADBIN
         break;
     }
     if (err) {

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 3ceac64..bcaff2a 100644 (file)
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1012,7 +1012,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
         st->codec->width= 0; /* let decoder init width/height */
         st->codec->height= 0;
         break;
-#ifdef CONFIG_FAAD
+#ifdef CONFIG_LIBFAAD
     case CODEC_ID_AAC:
 #endif
 #ifdef CONFIG_VORBIS_DECODER