diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-11 22:01:33 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-11 22:01:33 +0100 |
| commit | 8ee847b7af98a527d30664370e5784066becc49b (patch) | |
| tree | 169c1f8e1728ac94a1408183f863cb9e0a909c49 | |
| parent | 3df7af4a715ee88c9acbe0136a5d15564a9c10fd (diff) | |
| download | xine-lib-8ee847b7af98a527d30664370e5784066becc49b.tar.gz xine-lib-8ee847b7af98a527d30664370e5784066becc49b.tar.bz2 | |
Check for libavutil presence, set FFMPEG_* AVUTIL_* and FFMPEG_POSTPROC_* variables even when using internal copy.
| -rw-r--r-- | m4/decoders.m4 | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4 index 3552ba6a2..5a57045c9 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -106,9 +106,11 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ x"no") with_external_ffmpeg=no ;; x"soft") PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0], [with_external_ffmpeg=yes], [with_external_ffmpeg=no]) + PKG_CHECK_MODULES([AVUTIL], [libavutil], , [with_external_ffmpeg=no]) ;; x*) PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0], [with_external_ffmpeg=yes]) + PKG_CHECK_MODULES([AVUTIL], [libavutil]) ;; esac if test x"$with_external_ffmpeg" != x"no"; then @@ -125,7 +127,25 @@ use internal ffmpeg. *********************************************************************]) else AC_MSG_RESULT([Using included ffmpeg]) + FFMPEG_CFLAGS='$(AVUTIL_CFLAGS) -I$(top_srcdir)/contrib/ffmpeg/libavcodec' + FFMPEG_LIBS='$(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a $(AVUTIL_LIBS)' + FFMPEG_DEPS='$(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a $(AVUTIL_DEPS)' + FFMPEG_POSTPROC_CFLAGS='$(AVUTIL_CFLAGS) -I$(top_srcdir)/contrib/ffmpeg/libpostproc' + FFMPEG_POSTPROC_LIBS='$(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a $(AVUTIL_LIBS)' + FFMPEG_POSTPROC_DEPS='$(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a $(AVUTIL_DEPS)' + AVUTIL_CFLAGS='-I$(top_srcdir)/contrib/ffmpeg/libavutil' + AVUTIL_LIBS='$(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a' + AVUTIL_DEPS='$(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a' fi + AC_SUBST([FFMPEG_CFLAGS]) + AC_SUBST([FFMPEG_LIBS]) + AC_SUBST([FFMPEG_DEPS]) + AC_SUBST([FFMPEG_POSTPROC_CFLAGS]) + AC_SUBST([FFMPEG_POSTPROC_LIBS]) + AC_SUBST([FFMPEG_POSTPROC_DEPS]) + AC_SUBST([AVUTIL_CFLAGS]) + AC_SUBST([AVUTIL_LIBS]) + AC_SUBST([AVUTIL_DEPS]) AM_CONDITIONAL([FFMPEG_DISABLE_UNCOMMON_CODECS], [test x"$enable_ffmpeg_uncommon_codecs" = x"no"]) AM_CONDITIONAL([FFMPEG_DISABLE_POPULAR_CODECS], [test x"$enable_ffmpeg_popular_codecs" = x"no"]) AM_CONDITIONAL([WITH_EXTERNAL_FFMPEG], [test x"$with_external_ffmpeg" != x"no"]) |