comparison configure @ 29384:36a9b369cd9d

Change libamr support to libopencore-amr support. libamr support was removed from FFmpeg. based on a patch by Andrew Wason, rectalogic rectalogic com
author diego
date Sat, 18 Jul 2009 15:07:26 +0000
parents 6d4170532629
children 0b25cce295e6
comparison
equal deleted inserted replaced
29383:e9cab9f6ed62 29384:36a9b369cd9d
339 --disable-mp3lib disable builtin mp3lib [autodetect] 339 --disable-mp3lib disable builtin mp3lib [autodetect]
340 --disable-liba52 disable liba52 [autodetect] 340 --disable-liba52 disable liba52 [autodetect]
341 --disable-liba52-internal disable builtin liba52 [autodetect] 341 --disable-liba52-internal disable builtin liba52 [autodetect]
342 --disable-libmpeg2 disable builtin libmpeg2 [autodetect] 342 --disable-libmpeg2 disable builtin libmpeg2 [autodetect]
343 --disable-musepack disable musepack support [autodetect] 343 --disable-musepack disable musepack support [autodetect]
344 --disable-libamr_nb disable libamr narrowband [autodetect] 344 --disable-libopencore_amrnb disable libopencore_amr narrowband [autodetect]
345 --disable-libamr_wb disable libamr wideband [autodetect] 345 --disable-libopencore_amrwb disable libopencore_amr wideband [autodetect]
346 --disable-decoder=DECODER disable specified FFmpeg decoder 346 --disable-decoder=DECODER disable specified FFmpeg decoder
347 --enable-decoder=DECODER enable specified FFmpeg decoder 347 --enable-decoder=DECODER enable specified FFmpeg decoder
348 --disable-encoder=ENCODER disable specified FFmpeg encoder 348 --disable-encoder=ENCODER disable specified FFmpeg encoder
349 --enable-encoder=ENCODER enable specified FFmpeg encoder 349 --enable-encoder=ENCODER enable specified FFmpeg encoder
350 --disable-parser=PARSER disable specified FFmpeg parser 350 --disable-parser=PARSER disable specified FFmpeg parser
533 _cross_compile=auto 533 _cross_compile=auto
534 _prefix="/usr/local" 534 _prefix="/usr/local"
535 _libavutil_a=auto 535 _libavutil_a=auto
536 _libavutil_so=auto 536 _libavutil_so=auto
537 _libavcodec_a=auto 537 _libavcodec_a=auto
538 _libamr_nb=auto 538 _libopencore_amrnb=auto
539 _libamr_wb=auto 539 _libopencore_amrwb=auto
540 _libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') 540 _libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
541 _libavdecoders=$(echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER//) 541 _libavdecoders=$(echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER//)
542 _libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') 542 _libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
543 _libavencoders=$(echo $_libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g' -e s/AAC_ENCODER//) 543 _libavencoders=$(echo $_libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g' -e s/AAC_ENCODER//)
544 _libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') 544 _libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
1143 --disable-libavutil_so) _libavutil_so=no ;; 1143 --disable-libavutil_so) _libavutil_so=no ;;
1144 --enable-libavcodec_a) _libavcodec_a=yes ;; 1144 --enable-libavcodec_a) _libavcodec_a=yes ;;
1145 --disable-libavcodec_a) _libavcodec_a=no ;; 1145 --disable-libavcodec_a) _libavcodec_a=no ;;
1146 --enable-libavcodec_so) _libavcodec_so=yes ;; 1146 --enable-libavcodec_so) _libavcodec_so=yes ;;
1147 --disable-libavcodec_so) _libavcodec_so=no ;; 1147 --disable-libavcodec_so) _libavcodec_so=no ;;
1148 --enable-libamr_nb) _libamr_nb=yes ;; 1148 --enable-libopencore_amrnb) _libopencore_amrnb=yes ;;
1149 --disable-libamr_nb) _libamr_nb=no ;; 1149 --disable-libopencore_amrnb) _libopencore_amrnb=no ;;
1150 --enable-libamr_wb) _libamr_wb=yes ;; 1150 --enable-libopencore_amrwb) _libopencore_amrwb=yes ;;
1151 --disable-libamr_wb) _libamr_wb=no ;; 1151 --disable-libopencore_amrwb) _libopencore_amrwb=no ;;
1152 --enable-decoder=*) _libavdecoders="$_libavdecoders $(echo $ac_option | cut -d '=' -f 2)" ;; 1152 --enable-decoder=*) _libavdecoders="$_libavdecoders $(echo $ac_option | cut -d '=' -f 2)" ;;
1153 --disable-decoder=*) _libavdecoders=$(echo $_libavdecoders | sed "s/$(echo $ac_option | cut -d '=' -f 2)//g") ;; 1153 --disable-decoder=*) _libavdecoders=$(echo $_libavdecoders | sed "s/$(echo $ac_option | cut -d '=' -f 2)//g") ;;
1154 --enable-encoder=*) _libavencoders="$_libavencoders $(echo $ac_option | cut -d '=' -f 2)" ;; 1154 --enable-encoder=*) _libavencoders="$_libavencoders $(echo $ac_option | cut -d '=' -f 2)" ;;
1155 --disable-encoder=*) _libavencoders=$(echo $_libavencoders | sed "s/$(echo $ac_option | cut -d '=' -f 2)//g") ;; 1155 --disable-encoder=*) _libavencoders=$(echo $_libavencoders | sed "s/$(echo $ac_option | cut -d '=' -f 2)//g") ;;
1156 --enable-parser=*) _libavparsers="$_libavparsers $(echo $ac_option | cut -d '=' -f 2)" ;; 1156 --enable-parser=*) _libavparsers="$_libavparsers $(echo $ac_option | cut -d '=' -f 2)" ;;
7059 test "$_libswscale_a" = yes && def_libswscale_a='#define CONFIG_LIBSWSCALE_A 1' 7059 test "$_libswscale_a" = yes && def_libswscale_a='#define CONFIG_LIBSWSCALE_A 1'
7060 test "$_libswscale_so" = yes \ 7060 test "$_libswscale_so" = yes \
7061 && def_libswscale_so='#define CONFIG_LIBSWSCALE_SO 1' 7061 && def_libswscale_so='#define CONFIG_LIBSWSCALE_SO 1'
7062 echores "$_libswscale" 7062 echores "$_libswscale"
7063 7063
7064 echocheck "libamr narrowband" 7064 echocheck "libopencore_amr narrowband"
7065 if test "$_libamr_nb" = auto ; then 7065 if test "$_libopencore_amrnb" = auto ; then
7066 _libamr_nb=no 7066 _libopencore_amrnb=no
7067 cat > $TMPC << EOF 7067 cat > $TMPC << EOF
7068 #include <amrnb/sp_dec.h> 7068 #include <opencore-amrnb/interf_dec.h>
7069 int main(void) { Speech_Decode_Frame_init(); return 0; } 7069 int main(void) { Decoder_Interface_init(); return 0; }
7070 EOF 7070 EOF
7071 cc_check -lamrnb && _libamr_nb=yes 7071 cc_check -lopencore-amrnb && _libopencore_amrnb=yes
7072 if test "$_libavcodec_a" != yes ; then 7072 if test "$_libavcodec_a" != yes ; then
7073 _libamr_nb=no 7073 _libopencore_amrnb=no
7074 _res_comment="libavcodec (static) is required by libamr_nb, sorry" 7074 _res_comment="libavcodec (static) is required by libopencore_amrnb, sorry"
7075 fi 7075 fi
7076 fi 7076 fi
7077 if test "$_libamr_nb" = yes ; then 7077 if test "$_libopencore_amrnb" = yes ; then
7078 _libamr=yes 7078 _libopencore_amr=yes
7079 extra_ldflags="$extra_ldflags -lamrnb" 7079 extra_ldflags="$extra_ldflags -lopencore-amrnb"
7080 def_libamr='#define CONFIG_LIBAMR 1' 7080 def_libopencore_amrnb='#define CONFIG_LIBOPENCORE_AMRNB 1'
7081 def_libamr_nb='#define CONFIG_LIBAMR_NB 1' 7081 _libavdecoders="$_libavdecoders LIBOPENCORE_AMRNB_DECODER"
7082 _libavdecoders="$_libavdecoders LIBAMR_NB_DECODER" 7082 _libavencoders="$_libavencoders LIBOPENCORE_AMRNB_DECODER"
7083 _libavencoders="$_libavencoders LIBAMR_NB_ENCODER" 7083 _codecmodules="libopencore_amrnb $_codecmodules"
7084 _codecmodules="libamr_nb $_codecmodules" 7084 else
7085 else 7085 def_libopencore_amrnb='#define CONFIG_LIBOPENCORE_AMRNB 0'
7086 def_libamr_nb='#define CONFIG_LIBAMR_NB 0' 7086 _nocodecmodules="libopencore_amrnb $_nocodecmodules"
7087 _nocodecmodules="libamr_nb $_nocodecmodules" 7087 fi
7088 fi 7088 echores "$_libopencore_amrnb"
7089 echores "$_libamr_nb" 7089
7090 7090
7091 7091 echocheck "libopencore_amr wideband"
7092 echocheck "libamr wideband" 7092 if test "$_libopencore_amrwb" = auto ; then
7093 if test "$_libamr_wb" = auto ; then 7093 _libopencore_amrwb=no
7094 _libamr_wb=no
7095 cat > $TMPC << EOF 7094 cat > $TMPC << EOF
7096 #include <amrwb/dec_if.h> 7095 #include <opencore-amrwb/dec_if.h>
7097 int main(void) { D_IF_init(); return 0; } 7096 int main(void) { D_IF_init(); return 0; }
7098 EOF 7097 EOF
7099 cc_check -lamrwb && _libamr_wb=yes 7098 cc_check -lopencore-amrwb && _libopencore_amrwb=yes
7100 if test "$_libavcodec_a" != yes ; then 7099 if test "$_libavcodec_a" != yes ; then
7101 _libamr_wb=no 7100 _libopencore_amrwb=no
7102 _res_comment="libavcodec (static) is required by libamr_wb, sorry" 7101 _res_comment="libavcodec (static) is required by libopencore_amrwb, sorry"
7103 fi 7102 fi
7104 fi 7103 fi
7105 if test "$_libamr_wb" = yes ; then 7104 if test "$_libopencore_amrwb" = yes ; then
7106 _libamr=yes 7105 _libopencore_amr=yes
7107 extra_ldflags="$extra_ldflags -lamrwb" 7106 extra_ldflags="$extra_ldflags -lopencore-amrwb"
7108 def_libamr='#define CONFIG_LIBAMR 1' 7107 def_libopencore_amrwb='#define CONFIG_LIBOPENCORE_AMRWB 1'
7109 def_libamr_wb='#define CONFIG_LIBAMR_WB 1' 7108 _libavdecoders="$_libavdecoders LIBOPENCORE_AMRWB_DECODER"
7110 _libavdecoders="$_libavdecoders LIBAMR_WB_DECODER" 7109 _libavencoders="$_libavencoders LIBOPENCORE_AMRWB_DECODER"
7111 _libavencoders="$_libavencoders LIBAMR_WB_ENCODER" 7110 _codecmodules="libopencore_amrwb $_codecmodules"
7112 _codecmodules="libamr_wb $_codecmodules" 7111 else
7113 else 7112 def_libopencore_amrwb='#define LIBOPENCORE_AMRWB 0'
7114 def_libamr_wb='#define CONFIG_LIBAMR_WB 0' 7113 _nocodecmodules="libopencore_amrwb $_nocodecmodules"
7115 _nocodecmodules="libamr_wb $_nocodecmodules" 7114 fi
7116 fi 7115 echores "$_libopencore_amrwb"
7117 echores "$_libamr_wb"
7118 7116
7119 echocheck "libdv-0.9.5+" 7117 echocheck "libdv-0.9.5+"
7120 if test "$_libdv" = auto ; then 7118 if test "$_libdv" = auto ; then
7121 _libdv=no 7119 _libdv=no
7122 cat > $TMPC <<EOF 7120 cat > $TMPC <<EOF
8391 CONFIG_RDFT=yes 8389 CONFIG_RDFT=yes
8392 8390
8393 CONFIG_BZLIB=$bzlib 8391 CONFIG_BZLIB=$bzlib
8394 CONFIG_ENCODERS=yes 8392 CONFIG_ENCODERS=yes
8395 CONFIG_GPL=yes 8393 CONFIG_GPL=yes
8396 CONFIG_LIBAMR=$_libamr
8397 CONFIG_LIBAMR_NB=$_libamr_nb
8398 CONFIG_LIBAMR_WB=$_libamr_wb
8399 CONFIG_LIBDIRAC=$_libdirac_lavc 8394 CONFIG_LIBDIRAC=$_libdirac_lavc
8400 CONFIG_LIBFAAC=$_faac_lavc 8395 CONFIG_LIBFAAC=$_faac_lavc
8401 CONFIG_LIBMP3LAME=$_mp3lame_lavc 8396 CONFIG_LIBMP3LAME=$_mp3lame_lavc
8397 CONFIG_LIBOPENCORE_AMRNB=$_libopencore_amrnb
8398 CONFIG_LIBOPENCORE_AMRWB=$_libopencore_amrwb
8402 CONFIG_LIBSCHROEDINGER=$_libschroedinger_lavc 8399 CONFIG_LIBSCHROEDINGER=$_libschroedinger_lavc
8403 CONFIG_LIBVORBIS=$_libvorbis 8400 CONFIG_LIBVORBIS=$_libvorbis
8404 CONFIG_LIBX264=$_x264_lavc 8401 CONFIG_LIBX264=$_x264_lavc
8405 CONFIG_LIBXVID=$_xvid_lavc 8402 CONFIG_LIBXVID=$_xvid_lavc
8406 CONFIG_MLIB = $_mlib 8403 CONFIG_MLIB = $_mlib
8880 #define HAVE_EBP_AVAILABLE 0 8877 #define HAVE_EBP_AVAILABLE 0
8881 #endif 8878 #endif
8882 8879
8883 /* External libraries used through libavcodec. */ 8880 /* External libraries used through libavcodec. */
8884 $def_faac_lavc 8881 $def_faac_lavc
8885 $def_libamr
8886 $def_libamr_nb
8887 $def_libamr_wb
8888 $def_libdirac_lavc 8882 $def_libdirac_lavc
8883 $def_libopencore_amrnb
8884 $def_libopencore_amrwb
8889 $def_libschroedinger_lavc 8885 $def_libschroedinger_lavc
8890 $def_mp3lame_lavc 8886 $def_mp3lame_lavc
8891 $def_x264_lavc 8887 $def_x264_lavc
8892 $def_xvid_lavc 8888 $def_xvid_lavc
8893 8889