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

Update amr-nb and amr-wb checks for changes in FFmpeg. 

patch by Zuxy Meng, zuxy.meng gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22995 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-04-15 11:33:02 +00:00
parent a381e71128
commit 063b449fcc
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure vendored
View File

@ -6372,16 +6372,19 @@ echores "$_md5sum"
echocheck "AMR narrowband" echocheck "AMR narrowband"
if test "$_amr_nb" = auto ; then if test "$_amr_nb" = auto ; then
_amr_nb=no _amr_nb=no
if test -f libavcodec/amr_float/sp_dec.c ; then cat > $TMPC << EOF
if test "$_libavcodec" = yes ; then #include <amrnb/interf_dec.h>
_amr_nb=yes int main(void) { Speech_Decode_Frame_init(); return 0; }
else EOF
_res_comment="libavcodec (static) is required by amr_nb, sorry" cc_check -lamrnb && _amr_nb=yes
fi if test "$_libavcodec" != yes ; then
_amr_nb=no
_res_comment="libavcodec (static) is required by amr_nb, sorry"
fi fi
fi fi
if test "$_amr_nb" = yes ; then if test "$_amr_nb" = yes ; then
_amr=yes _amr=yes
_ld_extra="$_ld_extra -lamrnb"
_def_amr='#define CONFIG_AMR 1' _def_amr='#define CONFIG_AMR 1'
_def_amr_nb='#define CONFIG_AMR_NB 1' _def_amr_nb='#define CONFIG_AMR_NB 1'
else else
@ -6422,16 +6425,19 @@ fi
echocheck "AMR wideband" echocheck "AMR wideband"
if test "$_amr_wb" = auto ; then if test "$_amr_wb" = auto ; then
_amr_wb=no _amr_wb=no
if test -f libavcodec/amrwb_float/dec_dtx.c ; then cat > $TMPC << EOF
if test "$_libavcodec" = yes ; then #include <amrwb/dec_if.h>
_amr_wb=yes int main(void) { D_IF_init(); return 0; }
else EOF
_res_comment="libavcodec (static) is required by amr_wb, sorry" cc_check -lamrwb && _amr_wb=yes
fi if test "$_libavcodec" != yes ; then
_amr_wb=no
_res_comment="libavcodec (static) is required by amr_wb, sorry"
fi fi
fi fi
if test "$_amr_wb" = yes ; then if test "$_amr_wb" = yes ; then
_amr=yes _amr=yes
_ld_extra="$_ld_extra -lamrwb"
_def_amr='#define CONFIG_AMR 1' _def_amr='#define CONFIG_AMR 1'
_def_amr_wb='#define CONFIG_AMR_WB 1' _def_amr_wb='#define CONFIG_AMR_WB 1'
_codecmodules="amr_wb $_codecmodules" _codecmodules="amr_wb $_codecmodules"