comparison configure @ 16165:a9f7eff9e437

Support new static libavcodec (depends on libavutil).
author al
date Mon, 01 Aug 2005 20:16:56 +0000
parents 06b1f9d7dd4a
children 76d00448d786
comparison
equal deleted inserted replaced
16164:ec76d55a25f1 16165:a9f7eff9e437
5857 echores "no" 5857 echores "no"
5858 _def_live='#undef STREAMING_LIVE_DOT_COM' 5858 _def_live='#undef STREAMING_LIVE_DOT_COM'
5859 _noinputmodules="live.com $_noinputmodules" 5859 _noinputmodules="live.com $_noinputmodules"
5860 fi 5860 fi
5861 5861
5862 echocheck "FFmpeg libavutil (static)"
5863 if test -d libavutil ; then
5864 _libavutil=yes
5865 else
5866 _libavutil=no
5867 fi
5868 echores "$_libavutil"
5862 5869
5863 echocheck "FFmpeg libavcodec (static)" 5870 echocheck "FFmpeg libavcodec (static)"
5864 if test "$_libavcodec" = auto ; then 5871 if test "$_libavcodec" = auto ; then
5865 # Note: static linking is preferred to dynamic linking 5872 # Note: static linking is preferred to dynamic linking
5866 _libavcodec=no 5873 _libavcodec=no
5867 if test -d libavcodec && test -f libavcodec/utils.c ; then 5874 if test -d libavcodec && test -f libavcodec/utils.c ; then
5868 if grep avcodec_find_encoder_by_name libavcodec/utils.c > /dev/null 2>&1 ; then 5875 if grep avcodec_find_encoder_by_name libavcodec/utils.c > /dev/null 2>&1 ; then
5869 _libavcodec=yes 5876 # check if libavutil is a required
5870 echores "yes" 5877 cat > $TMPC << EOF
5878 #include "libavcodec/avcodec.h"
5879 #if LIBAVCODEC_BUILD >= 3211265
5880 #error We need libavutil!
5881 #endif
5882 int main(void) { return 0; }
5883 EOF
5884
5885 if cc_check -I. -I./libavutil; then
5886 _libavutil_required="no"
5887 else
5888 _libavutil_required="yes"
5889 fi
5890 if test "$_libavutil_required" != "$_libavutil"; then
5891 _libavcodec="no (libavutil availability does not fit libavcodec version)"
5892 else
5893 _libavcodec="yes"
5894 fi
5895 echores $_libavcodec
5871 else 5896 else
5872 echores "no (old ffmpeg version, use CVS !)" 5897 echores "no (old ffmpeg version, use CVS !)"
5873 fi 5898 fi
5874 else 5899 else
5875 echores "no (see DOCS/HTML/$_doc_lang/codecs.html)" 5900 echores "no (see DOCS/HTML/$_doc_lang/codecs.html)"
5928 _def_libavcodec='#define USE_LIBAVCODEC 1' 5953 _def_libavcodec='#define USE_LIBAVCODEC 1'
5929 _ld_libavcodec='libavcodec/libavcodec.a' 5954 _ld_libavcodec='libavcodec/libavcodec.a'
5930 _dep_libavcodec='libavcodec/libavcodec.a' 5955 _dep_libavcodec='libavcodec/libavcodec.a'
5931 _def_ffpostprocess='#define FF_POSTPROCESS 1' 5956 _def_ffpostprocess='#define FF_POSTPROCESS 1'
5932 _codecmodules="libavcodec $_codecmodules" 5957 _codecmodules="libavcodec $_codecmodules"
5958 if test "$_libavutil" = yes; then
5959 _ld_libavutil='libavutil/libavutil.a'
5960 _dep_libavutil='libavutil/libavutil.a'
5961 fi
5933 elif test "$_libavcodecso" = yes ; then 5962 elif test "$_libavcodecso" = yes ; then
5934 _def_libavcodec='#define USE_LIBAVCODEC 1' 5963 _def_libavcodec='#define USE_LIBAVCODEC 1'
5935 _def_libavcodecso='#define USE_LIBAVCODEC_SO 1' 5964 _def_libavcodecso='#define USE_LIBAVCODEC_SO 1'
5936 _ld_libavcodec='-lavcodec' 5965 _ld_libavcodec='-lavcodec'
5937 _codecmodules="libavcodec.so $_codecmodules" 5966 _codecmodules="libavcodec.so $_codecmodules"
7001 SDL_INC = $_inc_sdl 7030 SDL_INC = $_inc_sdl
7002 W32_DEP = $_dep_win32 7031 W32_DEP = $_dep_win32
7003 W32_LIB = $_ld_win32 7032 W32_LIB = $_ld_win32
7004 DS_DEP = $_dep_dshow 7033 DS_DEP = $_dep_dshow
7005 DS_LIB = $_ld_dshow 7034 DS_LIB = $_ld_dshow
7006 AV_DEP = $_dep_libavcodec $_dep_libavformat 7035 AV_DEP = $_dep_libavutil $_dep_libavcodec $_dep_libavformat
7007 AV_LIB = $_ld_libavcodec $_ld_libavformat 7036 AV_LIB = $_ld_libavformat $_ld_libavcodec $_ld_libavutil
7037 CONFIG_LIBAVUTIL = $_libavutil_required
7008 CONFIG_LIBAVCODEC = $_libavcodec 7038 CONFIG_LIBAVCODEC = $_libavcodec
7009 CONFIG_LIBAVFORMAT = $_libavformat 7039 CONFIG_LIBAVFORMAT = $_libavformat
7010 ZORAN = $_zr 7040 ZORAN = $_zr
7011 FAME = $_fame 7041 FAME = $_fame
7012 FAME_LIB = $_ld_fame 7042 FAME_LIB = $_ld_fame