Rename variables: a52 --> liba52, a52bin --> liba52bin

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

4 files changed, 18 insertions, 18 deletions

diff --git a/configure b/configure
index 2cf096ec18..669797b19e 100755
--- a/configure
+++ b/configure
@@ -74,7 +74,7 @@ show_help(){
   echo "  --enable-x264            enable H.264 encoding via x264 [default=no]"
   echo "  --enable-mingw32         enable MinGW native/cross Windows compile"
   echo "  --enable-mingwce         enable MinGW native/cross WinCE compile"
-  echo "  --enable-a52             enable GPLed A52 support [default=no]"
+  echo "  --enable-a52             enable GPLed liba52 support [default=no]"
   echo "  --enable-a52bin          open liba52.so.0 at runtime [default=no]"
   echo "  --enable-dts             enable GPLed DTS support [default=no]"
   echo "  --enable-pp              enable GPLed postprocessing support [default=no]"
@@ -407,8 +407,6 @@ CONFIG_LIST='
     parsers
     muxers
     demuxers
-    a52
-    a52bin
     amr
     amr_nb
     amr_nb_fixed
@@ -429,6 +427,8 @@ CONFIG_LIST='
     ffserver
     gpl
     ipv6
+    liba52
+    liba52bin
     libgsm
     libnut
     libogg
@@ -590,6 +590,8 @@ dc1394="no"
 network="yes"
 ipv6="yes"
 zlib="yes"
+liba52="no"
+liba52bin="no"
 libgsm="no"
 mp3lame="no"
 libnut="no"
@@ -600,8 +602,6 @@ faadbin="no"
 faac="no"
 xvid="no"
 x264="no"
-a52="no"
-a52bin="no"
 dts="no"
 pp="no"
 mingw32="no"
@@ -934,9 +934,9 @@ for opt do
   ;;
   --disable-zlib) zlib="no"
   ;;
-  --enable-a52) a52="yes"
+  --enable-a52) liba52="yes"
   ;;
-  --enable-a52bin) a52bin="yes"
+  --enable-a52bin) liba52bin="yes"
   ;;
   --enable-dts) dts="yes"
   ;;
@@ -1132,7 +1132,7 @@ if test "$gpl" != "yes"; then
         die "The Postprocessing code is under GPL and --enable-gpl is not specified."
     fi
 
-    if test "$a52" != "no" -o "$a52bin" != "no"; then
+    if test "$liba52" != "no" -o "$liba52bin" != "no"; then
         die "liba52 is under GPL and --enable-gpl is not specified."
     fi
 
@@ -1550,7 +1550,7 @@ if test "$vhook" = "default"; then
     vhook="$dlopen"
 fi
 
-if enabled_any vhook a52bin faadbin; then
+if enabled_any vhook liba52bin faadbin; then
     add_extralibs $ldl
 fi
 
@@ -1792,8 +1792,8 @@ if test $sdl_too_old = "yes"; then
 fi
 echo "Sun medialib support      $mlib"
 echo "AVISynth enabled          $avisynth"
-echo "liba52 support            $a52"
-echo "liba52 dlopened           $a52bin"
+echo "liba52 support            $liba52"
+echo "liba52 dlopened           $liba52bin"
 echo "libdts support            $dts"
 echo "libfaac enabled           $faac"
 echo "libfaad enabled           $faad"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index dca1968b2d..a3f5baa51b 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -252,10 +252,10 @@ OBJS-$(CONFIG_LIBVORBIS)               += oggvorbis.o
 OBJS-$(CONFIG_LIBGSM)                  += libgsm.o
 
 # currently using liba52 for ac3 decoding
-OBJS-$(CONFIG_A52)                     += a52dec.o
+OBJS-$(CONFIG_LIBA52)                  += a52dec.o
 
 # using builtin liba52 or runtime linked liba52.so.0
-OBJS-$(CONFIG_A52)$(CONFIG_A52BIN)     += liba52/bit_allocate.o \
+OBJS-$(CONFIG_LIBA52)$(CONFIG_LIBA52BIN)  += liba52/bit_allocate.o \
                                           liba52/bitstream.o    \
                                           liba52/downmix.o      \
                                           liba52/imdct.o        \
diff --git a/libavcodec/a52dec.c b/libavcodec/a52dec.c
index dec25138e6..e810bc7d77 100644
--- a/libavcodec/a52dec.c
+++ b/libavcodec/a52dec.c
@@ -27,7 +27,7 @@
 #include "avcodec.h"
 #include "liba52/a52.h"
 
-#ifdef CONFIG_A52BIN
+#ifdef CONFIG_LIBA52BIN
 #include <dlfcn.h>
 static const char* liba52name = "liba52.so.0";
 #endif
@@ -70,7 +70,7 @@ typedef struct AC3DecodeState {
 
 } AC3DecodeState;
 
-#ifdef CONFIG_A52BIN
+#ifdef CONFIG_LIBA52BIN
 static void* dlsymm(void* handle, const char* symbol)
 {
     void* f = dlsym(handle, symbol);
@@ -84,7 +84,7 @@ static int a52_decode_init(AVCodecContext *avctx)
 {
     AC3DecodeState *s = avctx->priv_data;
 
-#ifdef CONFIG_A52BIN
+#ifdef CONFIG_LIBA52BIN
     s->handle = dlopen(liba52name, RTLD_LAZY);
     if (!s->handle)
     {
@@ -239,7 +239,7 @@ static int a52_decode_end(AVCodecContext *avctx)
 {
     AC3DecodeState *s = avctx->priv_data;
     s->a52_free(s->state);
-#ifdef CONFIG_A52BIN
+#ifdef CONFIG_LIBA52BIN
     dlclose(s->handle);
 #endif
     return 0;
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index c5831d2a2a..cf1863139c 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -164,7 +164,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER(AAC, aac);
     REGISTER_DECODER(MPEG4AAC, mpeg4aac);
 #endif
-#ifdef CONFIG_A52
+#ifdef CONFIG_LIBA52
     REGISTER_DECODER(AC3, ac3);
 #endif
     REGISTER_ENCODER(AC3, ac3);