diff options
author | al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-01 20:16:56 +0000 |
---|---|---|
committer | al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-01 20:16:56 +0000 |
commit | bd342e463af94e4e748fc6f096b6ebb275685932 (patch) | |
tree | 05a0a74a063fe3cde419cde64c87a931de74e21d /configure | |
parent | 2d14fdcb3a53f7775543f8ef85cae5edf41d3637 (diff) | |
download | mpv-bd342e463af94e4e748fc6f096b6ebb275685932.tar.bz2 mpv-bd342e463af94e4e748fc6f096b6ebb275685932.tar.xz |
Support new static libavcodec (depends on libavutil).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16166 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 38 |
1 files changed, 34 insertions, 4 deletions
@@ -5859,6 +5859,13 @@ else _noinputmodules="live.com $_noinputmodules" fi +echocheck "FFmpeg libavutil (static)" +if test -d libavutil ; then + _libavutil=yes +else + _libavutil=no +fi +echores "$_libavutil" echocheck "FFmpeg libavcodec (static)" if test "$_libavcodec" = auto ; then @@ -5866,8 +5873,26 @@ if test "$_libavcodec" = auto ; then _libavcodec=no if test -d libavcodec && test -f libavcodec/utils.c ; then if grep avcodec_find_encoder_by_name libavcodec/utils.c > /dev/null 2>&1 ; then - _libavcodec=yes - echores "yes" + # check if libavutil is a required + cat > $TMPC << EOF +#include "libavcodec/avcodec.h" +#if LIBAVCODEC_BUILD >= 3211265 +#error We need libavutil! +#endif +int main(void) { return 0; } +EOF + + if cc_check -I. -I./libavutil; then + _libavutil_required="no" + else + _libavutil_required="yes" + fi + if test "$_libavutil_required" != "$_libavutil"; then + _libavcodec="no (libavutil availability does not fit libavcodec version)" + else + _libavcodec="yes" + fi + echores $_libavcodec else echores "no (old ffmpeg version, use CVS !)" fi @@ -5930,6 +5955,10 @@ if test "$_libavcodec" = yes ; then _dep_libavcodec='libavcodec/libavcodec.a' _def_ffpostprocess='#define FF_POSTPROCESS 1' _codecmodules="libavcodec $_codecmodules" + if test "$_libavutil" = yes; then + _ld_libavutil='libavutil/libavutil.a' + _dep_libavutil='libavutil/libavutil.a' + fi elif test "$_libavcodecso" = yes ; then _def_libavcodec='#define USE_LIBAVCODEC 1' _def_libavcodecso='#define USE_LIBAVCODEC_SO 1' @@ -7003,8 +7032,9 @@ W32_DEP = $_dep_win32 W32_LIB = $_ld_win32 DS_DEP = $_dep_dshow DS_LIB = $_ld_dshow -AV_DEP = $_dep_libavcodec $_dep_libavformat -AV_LIB = $_ld_libavcodec $_ld_libavformat +AV_DEP = $_dep_libavutil $_dep_libavcodec $_dep_libavformat +AV_LIB = $_ld_libavformat $_ld_libavcodec $_ld_libavutil +CONFIG_LIBAVUTIL = $_libavutil_required CONFIG_LIBAVCODEC = $_libavcodec CONFIG_LIBAVFORMAT = $_libavformat ZORAN = $_zr |