RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

FFmpeg sync: Rename AMR config settings to LIBAMR. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23221 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-05-03 12:07:13 +00:00
parent b7f32db6e8
commit d0c5bca869
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure vendored
View File

@ -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/'`