Mercurial > mplayer.hg

comparison configure @ 17354:60189cd9bbc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added support for external libavformat
author nicodvb
date Mon, 09 Jan 2006 19:35:44 +0000
parents 0bc4869be931
children 54519db088ee
comparison
equal deleted inserted replaced
17353:0bc4869be931 17354:60189cd9bbc8
1458 _amr_nb_fixed=auto 1458 _amr_nb_fixed=auto
1459 _amr_wb=auto 1459 _amr_wb=auto
1460 _libavcodecs=`grep 'register_avcodec(&[a-z]' libavcodec/allcodecs.c | sed 's/.*&\(.*\)).*/\1/'` 1460 _libavcodecs=`grep 'register_avcodec(&[a-z]' libavcodec/allcodecs.c | sed 's/.*&\(.*\)).*/\1/'`
1461 _libavcodecso=auto 1461 _libavcodecso=auto
1462 _libavformat=auto 1462 _libavformat=auto
1463 _libavformat_so=auto
1463 _fame=auto 1464 _fame=auto
1464 _mp1e=no 1465 _mp1e=no
1465 _mencoder=yes 1466 _mencoder=yes
1466 _x11=auto 1467 _x11=auto
1467 _dga=auto # 1 2 no auto 1468 _dga=auto # 1 2 no auto
6058 fi 6059 fi
6059 fi 6060 fi
6060 echores "$_libavcodecso" 6061 echores "$_libavcodecso"
6061 fi 6062 fi
6062 6063
6064 if test "$_libavformat" != yes ; then
6065 echocheck "FFmpeg libavformat (dynamic)"
6066 if test "$_libavformat_so" = auto ; then
6067 _libavformat_so=no
6068 cat > $TMPC <<EOF
6069 #include <ffmpeg/avformat.h>
6070 int main(void) { av_alloc_format_context(); return 0; }
6071 EOF
6072 cc_check $_ld_lm -lavformat && _libavformat_so=yes
6073 fi
6074 echores "$_libavformat_so"
6075 fi
6076
6063 _def_libavcodec='#undef USE_LIBAVCODEC' 6077 _def_libavcodec='#undef USE_LIBAVCODEC'
6064 _def_libavcodecso='#undef USE_LIBAVCODEC_SO' 6078 _def_libavcodecso='#undef USE_LIBAVCODEC_SO'
6065 _def_ffpostprocess='#undef FF_POSTPROCESS' 6079 _def_ffpostprocess='#undef FF_POSTPROCESS'
6066 if test "$_libavcodec" = yes ; then 6080 if test "$_libavcodec" = yes ; then
6067 _def_libavcodec='#define USE_LIBAVCODEC 1' 6081 _def_libavcodec='#define USE_LIBAVCODEC 1'
6081 else 6095 else
6082 _nocodecmodules="libavcodec $_nocodecmodules" 6096 _nocodecmodules="libavcodec $_nocodecmodules"
6083 fi 6097 fi
6084 6098
6085 _def_libavformat='#undef USE_LIBAVFORMAT' 6099 _def_libavformat='#undef USE_LIBAVFORMAT'
6100 _def_libavformat_so='#undef USE_LIBAVFORMAT_SO'
6086 _def_libavformat_win32='#undef CONFIG_WIN32' 6101 _def_libavformat_win32='#undef CONFIG_WIN32'
6087 if test "$_libavformat" = yes ; then 6102 if test "$_libavformat" = yes ; then
6088 _def_libavformat='#define USE_LIBAVFORMAT 1' 6103 _def_libavformat='#define USE_LIBAVFORMAT 1'
6089 _ld_libavformat='libavformat/libavformat.a' 6104 _ld_libavformat='libavformat/libavformat.a'
6090 _dep_libavformat='libavformat/libavformat.a' 6105 _dep_libavformat='libavformat/libavformat.a'
6091 if win32 ; then 6106 if win32 ; then
6092 _def_libavformat_win32='#define CONFIG_WIN32 1' 6107 _def_libavformat_win32='#define CONFIG_WIN32 1'
6108 fi
6109 else
6110 if test "$_libavformat_so" = yes ; then
6111 _def_libavformat_so='#define USE_LIBAVFORMAT_SO 1'
6112 _ld_libavformat='-lavformat'
6113 if win32 ; then
6114 _def_libavformat_win32='#define CONFIG_WIN32 1'
6115 fi
6093 fi 6116 fi
6094 fi 6117 fi
6095 6118
6096 echocheck "amr narrowband" 6119 echocheck "amr narrowband"
6097 if test "$_amr_nb" = auto ; then 6120 if test "$_amr_nb" = auto ; then
7182 AV_LIB = $_ld_libavformat $_ld_libavcodec $_ld_libavutil 7205 AV_LIB = $_ld_libavformat $_ld_libavcodec $_ld_libavutil
7183 CONFIG_LIBAVUTIL = $_libavutil 7206 CONFIG_LIBAVUTIL = $_libavutil
7184 CONFIG_LIBAVCODEC = $_libavcodec 7207 CONFIG_LIBAVCODEC = $_libavcodec
7185 CONFIG_LIBAVCODECSO = $_libavcodecso 7208 CONFIG_LIBAVCODECSO = $_libavcodecso
7186 CONFIG_LIBAVFORMAT = $_libavformat 7209 CONFIG_LIBAVFORMAT = $_libavformat
7210 CONFIG_LIBAVFORMAT_SO = $_libavformat_so
7187 ZORAN = $_zr 7211 ZORAN = $_zr
7188 FAME = $_fame 7212 FAME = $_fame
7189 FAME_LIB = $_ld_fame 7213 FAME_LIB = $_ld_fame
7190 MP1E_DEP = $_dep_mp1e 7214 MP1E_DEP = $_dep_mp1e
7191 MP1E_LIB = $_ld_mp1e 7215 MP1E_LIB = $_ld_mp1e
7574 $_def_libavcodec 7598 $_def_libavcodec
7575 $_def_libavcodecso 7599 $_def_libavcodecso
7576 7600
7577 /* ffmpeg's libavformat support (requires libavformat source) */ 7601 /* ffmpeg's libavformat support (requires libavformat source) */
7578 $_def_libavformat 7602 $_def_libavformat
7603 $_def_libavformat_so
7579 $_def_libavformat_win32 7604 $_def_libavformat_win32
7580 7605
7581 /* Use libavcodec's decoders */ 7606 /* Use libavcodec's decoders */
7582 #define CONFIG_DECODERS 1 7607 #define CONFIG_DECODERS 1
7583 /* Use libavcodec's encoders */ 7608 /* Use libavcodec's encoders */