aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2006-11-13 22:09:31 +0000
committerMåns Rullgård <mans@mansr.com>2006-11-13 22:09:31 +0000
commitaf63114e0d14c2d71768acbc3bb241907d895478 (patch)
treec249ae6009ad202075fc9cde380c63389eea165f /libavcodec/Makefile
parent3841a6aa7adf441dffd9837b6d1982f57bba55c5 (diff)
downloadffmpeg-af63114e0d14c2d71768acbc3bb241907d895478.tar.gz
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
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile4
1 files changed, 2 insertions, 2 deletions
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 \