# HG changeset patch # User diego # Date 1178194033 0 # Node ID 1f7a6525b929fa394998d3115ce6e0c624a8d982 # Parent a1d0bf522b249c5591e49ba7be43dcad7f07ee2c FFmpeg sync: Rename AMR config settings to LIBAMR. diff -r a1d0bf522b24 -r 1f7a6525b929 configure --- a/configure Thu May 03 12:04:29 2007 +0000 +++ b/configure Thu May 03 12:07:13 2007 +0000 @@ -6299,12 +6299,12 @@ if test "$_libamr_nb" = yes ; then _libamr=yes _ld_extra="$_ld_extra -lamrnb" - _def_libamr='#define CONFIG_AMR 1' - _def_libamr_nb='#define CONFIG_AMR_NB 1' -else - _def_libamr_nb='#undef CONFIG_AMR_NB' - _libavdecoders=`echo $_libavdecoders | sed -e s/AMR_NB_DECODER// ` - _libavencoders=`echo $_libavencoders | sed -e s/AMR_NB_ENCODER// ` + _def_libamr='#define CONFIG_LIBAMR 1' + _def_libamr_nb='#define CONFIG_LIBAMR_NB 1' +else + _def_libamr_nb='#undef CONFIG_LIBAMR_NB' + _libavdecoders=`echo $_libavdecoders | sed -e s/LIBAMR_NB_DECODER// ` + _libavencoders=`echo $_libavencoders | sed -e s/LIBAMR_NB_ENCODER// ` fi echores "$_libamr_nb" @@ -6330,14 +6330,14 @@ if test "$_libamr_wb" = yes ; then _libamr=yes _ld_extra="$_ld_extra -lamrwb" - _def_libamr='#define CONFIG_AMR 1' - _def_libamr_wb='#define CONFIG_AMR_WB 1' + _def_libamr='#define CONFIG_LIBAMR 1' + _def_libamr_wb='#define CONFIG_LIBAMR_WB 1' _codecmodules="amr_wb $_codecmodules" else - _def_libamr_wb='#undef CONFIG_AMR_WB' + _def_libamr_wb='#undef CONFIG_LIBAMR_WB' _nocodecmodules="amr_wb $_nocodecmodules" - _libavdecoders=`echo $_libavdecoders | sed -e s/AMR_WB_DECODER// ` - _libavencoders=`echo $_libavencoders | sed -e s/AMR_WB_ENCODER// ` + _libavdecoders=`echo $_libavdecoders | sed -e s/LIBAMR_WB_DECODER// ` + _libavencoders=`echo $_libavencoders | sed -e s/LIBAMR_WB_ENCODER// ` fi echores "$_libamr_wb" @@ -7677,9 +7677,9 @@ TOOLAME=$_toolame TWOLAME=$_twolame FAAC=$_faac -CONFIG_AMR=$_libamr -CONFIG_AMR_NB=$_libamr_nb -CONFIG_AMR_WB=$_libamr_wb +CONFIG_LIBAMR=$_libamr +CONFIG_LIBAMR_NB=$_libamr_nb +CONFIG_LIBAMR_WB=$_libamr_wb `echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` `echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` `echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`