Mercurial > mplayer.hg

comparison configure @ 17387:3fccbde62324

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Consistent variable names for shared libavcodec.
author diego
date Sat, 14 Jan 2006 16:26:42 +0000
parents 54519db088ee
children 3c2cd58df089
comparison
equal deleted inserted replaced
17386:54519db088ee 17387:3fccbde62324
1458 _libavcodec=auto 1458 _libavcodec=auto
1459 _amr_nb=auto 1459 _amr_nb=auto
1460 _amr_nb_fixed=auto 1460 _amr_nb_fixed=auto
1461 _amr_wb=auto 1461 _amr_wb=auto
1462 _libavcodecs=`grep 'register_avcodec(&[a-z]' libavcodec/allcodecs.c | sed 's/.*&\(.*\)).*/\1/'` 1462 _libavcodecs=`grep 'register_avcodec(&[a-z]' libavcodec/allcodecs.c | sed 's/.*&\(.*\)).*/\1/'`
1463 _libavcodecso=auto 1463 _libavcodec_so=auto
1464 _libavformat=auto 1464 _libavformat=auto
1465 _libavformat_so=auto 1465 _libavformat_so=auto
1466 _fame=auto 1466 _fame=auto
1467 _mp1e=no 1467 _mp1e=no
1468 _mencoder=yes 1468 _mencoder=yes
6045 _def_haveffpostprocess='yes' 6045 _def_haveffpostprocess='yes'
6046 fi 6046 fi
6047 6047
6048 if test "$_libavcodec" != yes ; then 6048 if test "$_libavcodec" != yes ; then
6049 echocheck "FFmpeg libavcodec (dynamic)" 6049 echocheck "FFmpeg libavcodec (dynamic)"
6050 if test "$_libavcodecso" = auto ; then 6050 if test "$_libavcodec_so" = auto ; then
6051 _libavcodecso=no 6051 _libavcodec_so=no
6052 _res_comment="libavcodec.so is broken/obsolete" 6052 _res_comment="libavcodec.so is broken/obsolete"
6053 # FIXME : check for avcodec_find_encoder_by_name() for mencoder 6053 # FIXME : check for avcodec_find_encoder_by_name() for mencoder
6054 cat > $TMPC << EOF 6054 cat > $TMPC << EOF
6055 #define FF_POSTPROCESS 1 6055 #define FF_POSTPROCESS 1
6056 #include <ffmpeg/avcodec.h> 6056 #include <ffmpeg/avcodec.h>
6058 avcodec_find_encoder_by_name(""); 6058 avcodec_find_encoder_by_name("");
6059 return 0; 6059 return 0;
6060 } 6060 }
6061 EOF 6061 EOF
6062 if cc_check -lavcodec $_ld_lm ; then 6062 if cc_check -lavcodec $_ld_lm ; then
6063 _libavcodecso=yes 6063 _libavcodec_so=yes
6064 _res_comment="using libavcodec.so, but static libavcodec is recommended" 6064 _res_comment="using libavcodec.so, but static libavcodec is recommended"
6065 fi 6065 fi
6066 fi 6066 fi
6067 echores "$_libavcodecso" 6067 echores "$_libavcodec_so"
6068 fi 6068 fi
6069 6069
6070 if test "$_libavformat" != yes ; then 6070 if test "$_libavformat" != yes ; then
6071 echocheck "FFmpeg libavformat (dynamic)" 6071 echocheck "FFmpeg libavformat (dynamic)"
6072 if test "$_libavformat_so" = auto ; then 6072 if test "$_libavformat_so" = auto ; then
6079 fi 6079 fi
6080 echores "$_libavformat_so" 6080 echores "$_libavformat_so"
6081 fi 6081 fi
6082 6082
6083 _def_libavcodec='#undef USE_LIBAVCODEC' 6083 _def_libavcodec='#undef USE_LIBAVCODEC'
6084 _def_libavcodecso='#undef USE_LIBAVCODEC_SO' 6084 _def_libavcodec_so='#undef USE_LIBAVCODEC_SO'
6085 _def_ffpostprocess='#undef FF_POSTPROCESS' 6085 _def_ffpostprocess='#undef FF_POSTPROCESS'
6086 if test "$_libavcodec" = yes ; then 6086 if test "$_libavcodec" = yes ; then
6087 _def_libavcodec='#define USE_LIBAVCODEC 1' 6087 _def_libavcodec='#define USE_LIBAVCODEC 1'
6088 _ld_libavcodec='libavcodec/libavcodec.a' 6088 _ld_libavcodec='libavcodec/libavcodec.a'
6089 _dep_libavcodec='libavcodec/libavcodec.a' 6089 _dep_libavcodec='libavcodec/libavcodec.a'
6091 _codecmodules="libavcodec $_codecmodules" 6091 _codecmodules="libavcodec $_codecmodules"
6092 if test "$_libavutil" = yes; then 6092 if test "$_libavutil" = yes; then
6093 _ld_libavutil='libavutil/libavutil.a' 6093 _ld_libavutil='libavutil/libavutil.a'
6094 _dep_libavutil='libavutil/libavutil.a' 6094 _dep_libavutil='libavutil/libavutil.a'
6095 fi 6095 fi
6096 elif test "$_libavcodecso" = yes ; then 6096 elif test "$_libavcodec_so" = yes ; then
6097 _def_libavcodec='#define USE_LIBAVCODEC 1' 6097 _def_libavcodec='#define USE_LIBAVCODEC 1'
6098 _def_libavcodecso='#define USE_LIBAVCODEC_SO 1' 6098 _def_libavcodec_so='#define USE_LIBAVCODEC_SO 1'
6099 _ld_libavcodec='-lavcodec' 6099 _ld_libavcodec='-lavcodec'
6100 _codecmodules="libavcodec.so $_codecmodules" 6100 _codecmodules="libavcodec.so $_codecmodules"
6101 else 6101 else
6102 _nocodecmodules="libavcodec $_nocodecmodules" 6102 _nocodecmodules="libavcodec $_nocodecmodules"
6103 fi 6103 fi
7209 DS_LIB = $_ld_dshow 7209 DS_LIB = $_ld_dshow
7210 AV_DEP = $_dep_libavutil $_dep_libavcodec $_dep_libavformat 7210 AV_DEP = $_dep_libavutil $_dep_libavcodec $_dep_libavformat
7211 AV_LIB = $_ld_libavformat $_ld_libavcodec $_ld_libavutil 7211 AV_LIB = $_ld_libavformat $_ld_libavcodec $_ld_libavutil
7212 CONFIG_LIBAVUTIL = $_libavutil 7212 CONFIG_LIBAVUTIL = $_libavutil
7213 CONFIG_LIBAVCODEC = $_libavcodec 7213 CONFIG_LIBAVCODEC = $_libavcodec
7214 CONFIG_LIBAVCODECSO = $_libavcodecso 7214 CONFIG_LIBAVCODEC_SO = $_libavcodec_so
7215 CONFIG_LIBAVFORMAT = $_libavformat 7215 CONFIG_LIBAVFORMAT = $_libavformat
7216 CONFIG_LIBAVFORMAT_SO = $_libavformat_so 7216 CONFIG_LIBAVFORMAT_SO = $_libavformat_so
7217 ZORAN = $_zr 7217 ZORAN = $_zr
7218 FAME = $_fame 7218 FAME = $_fame
7219 FAME_LIB = $_ld_fame 7219 FAME_LIB = $_ld_fame
7600 /* Build our Win32-loader */ 7600 /* Build our Win32-loader */
7601 $_def_win32_loader 7601 $_def_win32_loader
7602 7602
7603 /* ffmpeg's libavcodec support (requires libavcodec source) */ 7603 /* ffmpeg's libavcodec support (requires libavcodec source) */
7604 $_def_libavcodec 7604 $_def_libavcodec
7605 $_def_libavcodecso 7605 $_def_libavcodec_so
7606 7606
7607 /* ffmpeg's libavformat support (requires libavformat source) */ 7607 /* ffmpeg's libavformat support (requires libavformat source) */
7608 $_def_libavformat 7608 $_def_libavformat
7609 $_def_libavformat_so 7609 $_def_libavformat_so
7610 $_def_libavformat_win32 7610 $_def_libavformat_win32