Commit af63114e authored by Måns Rullgård's avatar Måns Rullgård
Browse files

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
parent 3841a6aa
......@@ -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
......
......@@ -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 \
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment