generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename CONFIG_AC3 to CONFIG_A52

Browse Source 
it's more consistent and Dolby never liked people "infringing" their TM

Originally committed as revision 7014 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-11-13 22:09:31 +00:00
parent 3841a6aa7a
commit af63114e0d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -1919,8 +1919,8 @@ fi
# AC3 # AC3
if test "$a52" = "yes" ; then if test "$a52" = "yes" ; then
echo "#define CONFIG_AC3 1" >> $TMPH echo "#define CONFIG_A52 1" >> $TMPH
echo "CONFIG_AC3=yes" >> config.mak echo "CONFIG_A52=yes" >> config.mak
if test "$a52bin" = "yes" ; then if test "$a52bin" = "yes" ; then
echo "#define CONFIG_A52BIN 1" >> $TMPH echo "#define CONFIG_A52BIN 1" >> $TMPH

4
libavcodec/Makefile
View File

@ -249,10 +249,10 @@ OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.o
OBJS-$(CONFIG_LIBGSM) += libgsm.o OBJS-$(CONFIG_LIBGSM) += libgsm.o
# currently using liba52 for ac3 decoding # 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 # 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/bitstream.o \
liba52/downmix.o \ liba52/downmix.o \
liba52/imdct.o \ liba52/imdct.o \

2
libavcodec/allcodecs.c
View File

@ -469,7 +469,7 @@ void avcodec_register_all(void)
#ifdef CONFIG_SONIC_DECODER #ifdef CONFIG_SONIC_DECODER
register_avcodec(&sonic_decoder); register_avcodec(&sonic_decoder);
#endif //CONFIG_SONIC_DECODER #endif //CONFIG_SONIC_DECODER
#ifdef CONFIG_AC3 #ifdef CONFIG_A52
#ifdef CONFIG_AC3_DECODER #ifdef CONFIG_AC3_DECODER
register_avcodec(&ac3_decoder); register_avcodec(&ac3_decoder);
#endif //CONFIG_AC3_DECODER #endif //CONFIG_AC3_DECODER