Mercurial > mplayer.hg

changeset 18399:8a8db87a884b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adapt to latest FFmpeg AMR build changes.
author diego
date Sun, 07 May 2006 16:21:13 +0000
parents a1375e440e92
children dfef33ea6ddc
files configure
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sun May 07 16:05:38 2006 +0000
+++ b/configure	Sun May 07 16:21:13 2006 +0000
@@ -6281,6 +6281,8 @@
   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 @@
   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 @@
   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 @@
 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 @@
 #define CONFIG_GPL 1
 
 /* Use amr codecs from libavcodec (requires amr sources) */
+$_def_amr
 $_def_amr_nb
 $_def_amr_nb_fixed
 $_def_amr_wb