diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-11-13 22:09:31 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-11-13 22:09:31 +0000 |
| commit | af63114e0d14c2d71768acbc3bb241907d895478 (patch) | |
| tree | c249ae6009ad202075fc9cde380c63389eea165f | |
| parent | 3841a6aa7adf441dffd9837b6d1982f57bba55c5 (diff) | |
rename CONFIG_AC3 to CONFIG_A52
it's more consistent and Dolby never liked people "infringing" their TM
Originally committed as revision 7014 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -1919,8 +1919,8 @@ fi # 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 diff --git a/libavcodec/Makefile b/libavcodec/Makefile index dda01f94af..79daa80b49 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -249,10 +249,10 @@ OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.o 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 \ diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 4e6215a55f..ac68a8f0fd 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -469,7 +469,7 @@ void avcodec_register_all(void) #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 |