diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-03 12:07:13 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-03 12:07:13 +0000 |
| commit | d0c5bca869963cb64d9908f73de88128ac683b30 (patch) | |
| tree | 880bc0ddb7cd08bd1ee92f5482e2d18482a81eff /configure | |
| parent | b7f32db6e82e9441d585dd2ba630550f1884f2d9 (diff) | |
| download | mpv-d0c5bca869963cb64d9908f73de88128ac683b30.tar.bz2 mpv-d0c5bca869963cb64d9908f73de88128ac683b30.tar.xz | |
FFmpeg sync: Rename AMR config settings to LIBAMR.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23221 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -6299,12 +6299,12 @@ fi 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' + _def_libamr='#define CONFIG_LIBAMR 1' + _def_libamr_nb='#define CONFIG_LIBAMR_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_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 @@ fi 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 @@ MACOSX_COREVIDEO = $_macosx_corevideo 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/'` |