[Ffmpeg-cvslog] r7014 - in trunk: configure libavcodec/Makefile libavcodec/allcodecs.c

[mru]

Author: mru
Date: Mon Nov 13 23:09:31 2006
New Revision: 7014

Modified:
   trunk/configure
   trunk/libavcodec/Makefile
   trunk/libavcodec/allcodecs.c

Log:
rename CONFIG_AC3 to CONFIG_A52
it's more consistent and Dolby never liked people "infringing" their TM


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Nov 13 23:09:31 2006
@@ -1919,8 +1919,8 @@
 
 # AC3
 if test "$a52" = "yes" ; then
-  echo "#define CONFIG_AC3 1" >> $TMPH
-  echo "CONFIG_AC3=yes" >> config.mak
+  echo "#define CONFIG_A52 1" >> $TMPH
+  echo "CONFIG_A52=yes" >> config.mak
 
   if test "$a52bin" = "yes" ; then
     echo "#define CONFIG_A52BIN 1" >> $TMPH

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Mon Nov 13 23:09:31 2006
@@ -249,10 +249,10 @@
 OBJS-$(CONFIG_LIBGSM)                  += libgsm.o
 
 # currently using liba52 for ac3 decoding
-OBJS-$(CONFIG_AC3)                     += a52dec.o
+OBJS-$(CONFIG_A52)                     += a52dec.o
 
 # using builtin liba52 or runtime linked liba52.so.0
-OBJS-$(CONFIG_AC3)$(CONFIG_A52BIN)     += liba52/bit_allocate.o \
+OBJS-$(CONFIG_A52)$(CONFIG_A52BIN)     += liba52/bit_allocate.o \
                                           liba52/bitstream.o    \
                                           liba52/downmix.o      \
                                           liba52/imdct.o        \

Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c	(original)
+++ trunk/libavcodec/allcodecs.c	Mon Nov 13 23:09:31 2006
@@ -469,7 +469,7 @@
 #ifdef CONFIG_SONIC_DECODER
     register_avcodec(&sonic_decoder);
 #endif //CONFIG_SONIC_DECODER
-#ifdef CONFIG_AC3
+#ifdef CONFIG_A52
 #ifdef CONFIG_AC3_DECODER
     register_avcodec(&ac3_decoder);
 #endif //CONFIG_AC3_DECODER