Mercurial > libavcodec.hg

changeset 4194:6a1e9e3a7303 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename CONFIG_AC3 to CONFIG_A52 it's more consistent and Dolby never liked people "infringing" their TM
author mru
date Mon, 13 Nov 2006 22:09:31 +0000
parents cdefe220b007
children 6b784f65ce16
files Makefile allcodecs.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Nov 13 11:39:28 2006 +0000
+++ b/Makefile	Mon Nov 13 22:09:31 2006 +0000
@@ -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        \
--- a/allcodecs.c	Mon Nov 13 11:39:28 2006 +0000
+++ b/allcodecs.c	Mon Nov 13 22:09:31 2006 +0000
@@ -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