# HG changeset patch # User mru # Date 1163455771 0 # Node ID 6a1e9e3a730365f6d8194847872848e6e8781796 # Parent cdefe220b0074c361999454e4f17bea14c150065 rename CONFIG_AC3 to CONFIG_A52 it's more consistent and Dolby never liked people "infringing" their TM diff -r cdefe220b007 -r 6a1e9e3a7303 Makefile --- 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 \ diff -r cdefe220b007 -r 6a1e9e3a7303 allcodecs.c --- 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