Mercurial > mplayer.hg
changeset 23205:32e7b5a67728
cosmetics: Rename remaining instances of amr_* to libamr_*.
| author | diego |
|---|---|
| date | Thu, 03 May 2007 12:10:22 +0000 |
| parents | 9429926a3a42 |
| children | 4d544d4d2a88 |
| files | configure |
| diffstat | 1 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu May 03 12:08:54 2007 +0000 +++ b/configure Thu May 03 12:10:22 2007 +0000 @@ -6283,7 +6283,7 @@ fi echores "$_md5sum" -echocheck "AMR narrowband" +echocheck "libamr narrowband" if test "$_libamr_nb" = auto ; then _libamr_nb=no cat > $TMPC << EOF @@ -6293,7 +6293,7 @@ cc_check -lamrnb && _libamr_nb=yes if test "$_libavcodec_a" != yes ; then _libamr_nb=no - _res_comment="libavcodec (static) is required by amr_nb, sorry" + _res_comment="libavcodec (static) is required by libamr_nb, sorry" fi fi if test "$_libamr_nb" = yes ; then @@ -6309,12 +6309,12 @@ echores "$_libamr_nb" if test "$_libamr_nb" = yes ; then - _codecmodules="amr_nb $_codecmodules" -else - _nocodecmodules="amr_nb $_nocodecmodules" -fi - -echocheck "AMR wideband" + _codecmodules="libamr_nb $_codecmodules" +else + _nocodecmodules="libamr_nb $_nocodecmodules" +fi + +echocheck "libamr wideband" if test "$_libamr_wb" = auto ; then _libamr_wb=no cat > $TMPC << EOF @@ -6324,7 +6324,7 @@ cc_check -lamrwb && _libamr_wb=yes if test "$_libavcodec_a" != yes ; then _libamr_wb=no - _res_comment="libavcodec (static) is required by amr_wb, sorry" + _res_comment="libavcodec (static) is required by libamr_wb, sorry" fi fi if test "$_libamr_wb" = yes ; then @@ -6332,10 +6332,10 @@ _ld_extra="$_ld_extra -lamrwb" _def_libamr='#define CONFIG_LIBAMR 1' _def_libamr_wb='#define CONFIG_LIBAMR_WB 1' - _codecmodules="amr_wb $_codecmodules" + _codecmodules="libamr_wb $_codecmodules" else _def_libamr_wb='#undef CONFIG_LIBAMR_WB' - _nocodecmodules="amr_wb $_nocodecmodules" + _nocodecmodules="libamr_wb $_nocodecmodules" _libavdecoders=`echo $_libavdecoders | sed -e s/LIBAMR_WB_DECODER// ` _libavencoders=`echo $_libavencoders | sed -e s/LIBAMR_WB_ENCODER// ` fi