diff options
author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-11 14:26:04 +0000 |
---|---|---|
committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-11 14:26:04 +0000 |
commit | 8580ca5c5ff48b8aaa1c3f9686fb6ab3bc7e75e8 (patch) | |
tree | 81ab5dd2f2f2979b3a4d2a6f0e2e9346a1cad0a6 /configure | |
parent | c6df54c8352fdeafecb3af064c8e617e5060d6c1 (diff) | |
download | mpv-8580ca5c5ff48b8aaa1c3f9686fb6ab3bc7e75e8.tar.bz2 mpv-8580ca5c5ff48b8aaa1c3f9686fb6ab3bc7e75e8.tar.xz |
demux_lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12165 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 35 |
1 files changed, 32 insertions, 3 deletions
@@ -199,6 +199,7 @@ Codecs: --disable-divx4linux disable DivX4linux/Divx5linux codec [autodetect] --enable-opendivx enable _old_ OpenDivx codec [disable] --disable-libavcodec disable libavcodec [autodetect] + --disable-libavformat disable libavformat [autodetect] --enable-libfame enable libfame realtime encoder [autodetect] --enable-vorbis build with OggVorbis support [autodetect] --enable-tremor build with integer-only OggVorbis support [disabled] @@ -1133,6 +1134,7 @@ _xvmclib="XvMCNVIDIA" # If autodetection is available then the third state is: auto _libavcodec=auto _libavcodecso=auto +_libavformat=auto _fame=auto _mp1e=no _mencoder=yes @@ -1412,6 +1414,8 @@ for ac_option do --disable-opendivx) _opendivx=no ;; --enable-libavcodec) _libavcodec=yes ;; --disable-libavcodec) _libavcodec=no ;; + --enable-libavformat) _libavformat=yes;; + --disable-libavformat) _libavformat=no ;; --enable-libfame) _fame=yes ;; --disable-libfame) _fame=no ;; --enable-lirc) _lirc=yes ;; @@ -5029,6 +5033,20 @@ else echores "$_libavcodec" fi +echocheck "FFmpeg libavformatc (static)" +if test "$_libavformat" = auto ; then + # Note: static linking is preferred to dynamic linking + _libavformat=no + if test -d libavformat && test -f libavformat/utils.c ; then + _libavformat=yes + echores "yes" + else + echores "no" + fi +else + echores "$_libavformat" +fi + _def_haveffpostprocess='no' if test -d libavcodec && test -f libavcodec/libpostproc/postprocess.h ; then _def_haveffpostprocess='yes' @@ -5076,6 +5094,13 @@ else _nocodecmodules="libavcodec $_nocodecmodules" fi +_def_libavformat='#undef USE_LIBAVFORMAT' +if test "$_libavformat" = yes ; then + _def_libavformat='#define USE_LIBAVFORMAT 1' + _ld_libavformat='libavformat/libavformat.a' + _dep_libavformat='libavformat/libavformat.a' +fi + echocheck "libdv-0.9.5+" if test "$_libdv" = auto ; then _libdv=no @@ -5918,7 +5943,7 @@ X11DIR = $_ld_x11 HAVE_XVMC_ACCEL = $_xvmc # for libavcodec: -SRC_PATH=. +SRC_PATH=.. LIBPREF=lib LIBSUF=.a SLIBPREF=lib @@ -5961,8 +5986,9 @@ W32_DEP = $_dep_win32 W32_LIB = $_ld_win32 DS_DEP = $_dep_dshow DS_LIB = $_ld_dshow -AV_DEP = $_dep_libavcodec -AV_LIB = $_ld_libavcodec +AV_DEP = $_dep_libavcodec $_dep_libavformat +AV_LIB = $_ld_libavcodec $_ld_libavformat +CONFIG_LIBAVFORMAT = $_libavformat ZORAN = $_zr FAME = $_fame FAME_LIB = $_ld_fame @@ -6268,6 +6294,9 @@ $_def_win32_loader $_def_libavcodec $_def_libavcodecso +/* ffmpeg's libavformat support (requires libavformat source) */ +$_def_libavformat + /* risky codecs */ #define CONFIG_RISKY 1 |