diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-05-07 16:21:13 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-05-07 16:21:13 +0000 |
| commit | c8d7076adbd5c52d9f1b8f4433c0e29fe745fb7b (patch) | |
| tree | 8257a5227a59959adcb9e1f7c6195b2c08e0d010 /configure | |
| parent | 56286b38d42575595f821fcedb07c65a2c5304b4 (diff) | |
| download | mpv-c8d7076adbd5c52d9f1b8f4433c0e29fe745fb7b.tar.bz2 mpv-c8d7076adbd5c52d9f1b8f4433c0e29fe745fb7b.tar.xz | |
Adapt to latest FFmpeg AMR build changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18400 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -6281,6 +6281,8 @@ if test "$_amr_nb" = auto ; then fi 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' @@ -6303,6 +6305,8 @@ if test "$_amr_nb_fixed" = auto ; then fi 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' @@ -6327,6 +6331,8 @@ if test "$_amr_wb" = auto ; then fi fi if test "$_amr_wb" = yes ; then + _amr=yes + _def_amr='#define AMR 1' _def_amr_wb='#define AMR_WB 1' _codecmodules="amr_wb $_codecmodules" else @@ -7467,6 +7473,7 @@ TWOLAME_LIB=$_twolame_lib 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 @@ -7835,6 +7842,7 @@ $_def_libavformat_win32 #define CONFIG_GPL 1 /* Use amr codecs from libavcodec (requires amr sources) */ +$_def_amr $_def_amr_nb $_def_amr_nb_fixed $_def_amr_wb |