Mercurial > mplayer.hg
changeset 19032:55990b84e83c
Sync with latest FFmpeg build system changes:
All AMR defines now sport a CONFIG_ prefix for consistency.
| author | diego |
|---|---|
| date | Wed, 12 Jul 2006 16:59:54 +0000 |
| parents | 45d4d4a4fead |
| children | 9fd34039e6df |
| files | configure |
| diffstat | 1 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Jul 12 16:43:03 2006 +0000 +++ b/configure Wed Jul 12 16:59:54 2006 +0000 @@ -6336,10 +6336,10 @@ fi if test "$_amr_nb" = yes ; then _amr=yes - _def_amr='#define AMR 1' - _def_amr_nb='#define AMR_NB 1' -else - _def_amr_nb='#undef AMR_NB' + _def_amr='#define CONFIG_AMR 1' + _def_amr_nb='#define CONFIG_AMR_NB 1' +else + _def_amr_nb='#undef CONFIG_AMR_NB' fi echores "$_amr_nb" @@ -6360,10 +6360,10 @@ fi if test "$_amr_nb_fixed" = yes ; then _amr=yes - _def_amr='#define AMR 1' - _def_amr_nb_fixed='#define AMR_NB_FIXED 1' -else - _def_amr_nb_fixed='#undef AMR_NB_FIXED' + _def_amr='#define CONFIG_AMR 1' + _def_amr_nb_fixed='#define CONFIG_AMR_NB_FIXED 1' +else + _def_amr_nb_fixed='#undef CONFIG_AMR_NB_FIXED' fi echores "$_amr_nb_fixed" @@ -6386,11 +6386,11 @@ fi if test "$_amr_wb" = yes ; then _amr=yes - _def_amr='#define AMR 1' - _def_amr_wb='#define AMR_WB 1' + _def_amr='#define CONFIG_AMR 1' + _def_amr_wb='#define CONFIG_AMR_WB 1' _codecmodules="amr_wb $_codecmodules" else - _def_amr_wb='#undef AMR_WB' + _def_amr_wb='#undef CONFIG_AMR_WB' _nocodecmodules="amr_wb $_nocodecmodules" fi echores "$_amr_wb" @@ -7614,10 +7614,10 @@ MUSEPACK_LIB = $_ld_musepack FAAC=$_faac FAAC_LIB=$_ld_faac -AMR=$_amr -AMR_NB=$_amr_nb -AMR_NB_FIXED=$_amr_nb_fixed -AMR_WB=$_amr_wb +CONFIG_AMR=$_amr +CONFIG_AMR_NB=$_amr_nb +CONFIG_AMR_NB_FIXED=$_amr_nb_fixed +CONFIG_AMR_WB=$_amr_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/'`