Mercurial > mplayer.hg
changeset 23101:253a6da2be20
Add general variables for either static or shared FFmpeg libraries.
| author | diego |
|---|---|
| date | Thu, 26 Apr 2007 11:22:22 +0000 |
| parents | 23fb118dc55a |
| children | cad9ebe1516c |
| files | configure libaf/Makefile libmpcodecs/Makefile libmpdemux/Makefile |
| diffstat | 4 files changed, 20 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Apr 26 11:19:29 2007 +0000 +++ b/configure Thu Apr 26 11:22:22 2007 +0000 @@ -6152,6 +6152,7 @@ echocheck "FFmpeg libavutil (static)" if test "$_libavutil_a" = auto ; then if test -d libavutil ; then + _libavutil=yes _libavutil_a=yes else die "MPlayer will not compile without libavutil in the source tree." @@ -6183,6 +6184,7 @@ fi _res_comment="libavutil availability does not fit libavcodec version" if test "$_libavutil_required" = "$_libavutil_a"; then + _libavcodec="yes" _libavcodec_a="yes" _res_comment="" fi @@ -6196,6 +6198,7 @@ # Note: static linking is preferred to dynamic linking _libavformat_a=no if test -d libavformat && test -f libavformat/utils.c ; then + _libavformat=yes _libavformat_a=yes fi fi @@ -6205,6 +6208,7 @@ if test "$_libpostproc_a" = auto ; then _libpostproc_a=no if test -d libpostproc && test -f libpostproc/postprocess.h ; then + _libpostproc='yes' _libpostproc_a='yes' fi fi @@ -6223,9 +6227,10 @@ _inc_libavutil=`$_pkg_config --cflags libavutil` _ld_tmp=`$_pkg_config --libs libavutil` cc_check $_inc_libavutil $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" \ - && _libavutil_so=yes + && _libavutil=yes && _libavutil_so=yes elif cc_check -lavutil $_ld_lm ; then _ld_extra="$_ld_extra -lavutil" + _libavutil=yes _libavutil_so=yes _res_comment="using libavutil.so, but static libavutil is recommended" fi @@ -6254,9 +6259,10 @@ _inc_libavcodec=`$_pkg_config --cflags libavcodec` _ld_tmp=`$_pkg_config --libs libavcodec` cc_check $_inc_libavcodec $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" \ - && _libavcodec_so=yes + && _libavcodec=yes && _libavcodec_so=yes elif cc_check -lavcodec $_ld_lm ; then _ld_extra="$_ld_extra -lavcodec" + _libavcodec=yes _libavcodec_so=yes _res_comment="using libavcodec.so, but static libavcodec is recommended" fi @@ -6277,9 +6283,10 @@ _inc_libavformat=`$_pkg_config --cflags libavformat` _ld_tmp=`$_pkg_config --libs libavformat` cc_check $_inc_libavformat $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" \ - && _libavformat_so=yes + && _libavformat=yes && _libavformat_so=yes elif cc_check $_ld_lm -lavformat ; then _ld_extra="$_ld_extra -lavformat" + _libavformat=yes _libavformat_so=yes _res_comment="using libavformat.so, but static libavformat is recommended" fi @@ -6301,6 +6308,7 @@ EOF if cc_check -lpostproc $_ld_lm ; then _ld_extra="$_ld_extra -lpostproc" + _libpostproc=yes _libpostproc_so=yes _res_comment="using libpostproc.so, but static libpostproc is recommended" fi @@ -7722,13 +7730,17 @@ QTX_CODECS = $_qtx REAL_CODECS = $_real XANIM_CODECS = $_xanim -LIBAVUTIL = $_libavutil_a +LIBAVUTIL = $_libavutil +LIBAVUTIL_A = $_libavutil_a LIBAVUTIL_SO = $_libavutil_so -LIBAVCODEC = $_libavcodec_a +LIBAVCODEC = $_libavcodec +LIBAVCODEC_A = $_libavcodec_a LIBAVCODEC_SO = $_libavcodec_so -LIBAVFORMAT = $_libavformat_a +LIBAVFORMAT = $_libavformat +LIBAVFORMAT_A = $_libavformat_a LIBAVFORMAT_SO = $_libavformat_so -LIBPOSTPROC = $_libpostproc_a +LIBPOSTPROC = $_libpostproc +LIBPOSTPROC_A = $_libpostproc_a LIBPOSTPROC_SO = $_libpostproc_so ZORAN = $_zr LIBLZO = $_liblzo
--- a/libaf/Makefile Thu Apr 26 11:19:29 2007 +0000 +++ b/libaf/Makefile Thu Apr 26 11:22:22 2007 +0000 @@ -30,6 +30,5 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += af_export.c SRCS_COMMON-$(LIBAVCODEC) += af_lavcresample.c -SRCS_COMMON-$(LIBAVCODEC_SO) += af_lavcresample.c include ../mpcommon.mak
--- a/libmpcodecs/Makefile Thu Apr 26 11:19:29 2007 +0000 +++ b/libmpcodecs/Makefile Thu Apr 26 11:22:22 2007 +0000 @@ -94,7 +94,7 @@ vf_yvu9.c \ # These filters use private headers and do not work with shared libavcodec. -SRCS_COMMON-$(LIBAVCODEC) += vf_fspp.c \ +SRCS_COMMON-$(LIBAVCODEC_A) += vf_fspp.c \ vf_geq.c \ vf_mcdeint.c \ vf_qp.c \ @@ -107,12 +107,10 @@ SRCS_COMMON-$(JPEG) += vd_ijpg.c SRCS_COMMON-$(LIBA52) += ad_liba52.c SRCS_COMMON-$(LIBAVCODEC) += ad_ffmpeg.c vd_ffmpeg.c vf_lavc.c vf_lavcdeint.c -SRCS_COMMON-$(LIBAVCODEC_SO) += ad_ffmpeg.c vd_ffmpeg.c vf_lavc.c vf_lavcdeint.c SRCS_COMMON-$(LIBDV) += ad_libdv.c vd_libdv.c SRCS_COMMON-$(LIBMAD) += ad_libmad.c SRCS_COMMON-$(LIBMPEG2) += vd_libmpeg2.c SRCS_COMMON-$(LIBPOSTPROC) += vf_pp.c -SRCS_COMMON-$(LIBPOSTPROC_SO) += vf_pp.c SRCS_COMMON-$(LIBTHEORA) += vd_theora.c SRCS_COMMON-$(LIBVORBIS) += ad_libvorbis.c SRCS_COMMON-$(MP3LIB) += ad_mp3lib.c @@ -134,7 +132,6 @@ ve_raw.c \ SRCS_MENCODER-$(LIBAVCODEC) += ae_lavc.c ve_lavc.c -SRCS_MENCODER-$(LIBAVCODEC_SO) += ae_lavc.c ve_lavc.c SRCS_MENCODER-$(LIBDV) += ve_libdv.c SRCS_MENCODER-$(LIBLZO) += ve_nuv.c SRCS_MENCODER-$(QTX_CODECS) += ve_qtvideo.c
--- a/libmpdemux/Makefile Thu Apr 26 11:19:29 2007 +0000 +++ b/libmpdemux/Makefile Thu Apr 26 11:22:22 2007 +0000 @@ -47,7 +47,6 @@ SRCS_COMMON-$(GIF) += demux_gif.c SRCS_COMMON-$(LIBAVFORMAT) += demux_lavf.c -SRCS_COMMON-$(LIBAVFORMAT_SO) += demux_lavf.c SRCS_COMMON-$(LIBDV) += demux_rawdv.c SRCS_COMMON-$(LIBNUT) += demux_nut.c SRCS_COMMON-$(LIBVORBIS) += demux_ogg.c @@ -63,7 +62,6 @@ muxer_rawvideo.c \ SRCS_MENCODER-$(LIBAVFORMAT) += muxer_lavf.c -SRCS_MENCODER-$(LIBAVFORMAT_SO) += muxer_lavf.c include ../mpcommon.mak