]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7519: [mod_avformat] add libavutil and libavresample to linking deps
authorMichael Jerris <mike@jerris.com>
Mon, 4 May 2015 17:54:47 +0000 (12:54 -0500)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:28 +0000 (12:47 -0500)
configure.ac
src/mod/formats/mod_avformat/Makefile.am

index 0709635de8240d622d410785bca3dff0d59fdc12..39f8143384aae21d970f8b4b61d3c3832fbb7f9c 100644 (file)
@@ -1271,6 +1271,15 @@ PKG_CHECK_MODULES([AVFORMAT], [libavformat >= 53.21.1],[
   AM_CONDITIONAL([HAVE_AVFORMAT],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AVFORMAT],[false])])
 
+PKG_CHECK_MODULES([AVUTIL], [libavutil >= 54.3.0],[
+  AM_CONDITIONAL([HAVE_AVUTIL],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AVUTIL],[false])])
+
+PKG_CHECK_MODULES([AVRESAMPLE], [libavresample >= 2.1.0],[
+  AM_CONDITIONAL([HAVE_AVRESAMPLE],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AVRESAMPLE],[false])])
+
+
 PKG_CHECK_MODULES([SWSCALE], [libswscale >= 3.0.0],[
   AM_CONDITIONAL([HAVE_SWSCALE],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SWSCALE],[false])])
index 33459ee59a5c6dda9081c0c8be3f2d4f026eb1f1..483504e01cdedbae692ca4321b1bf8576062fcab 100644 (file)
@@ -5,8 +5,8 @@ if HAVE_AVFORMAT
 
 mod_LTLIBRARIES = mod_avformat.la
 mod_avformat_la_SOURCES  = mod_avformat.c
-mod_avformat_la_CFLAGS   = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVCODEC_CFLAGS) $(SWSCALE_CFLAGS)
-mod_avformat_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(AVFORMAT_LIBS) $(AVCODEC_LIBS) $(SWSCALE_LIBS)
+mod_avformat_la_CFLAGS   = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVCODEC_CFLAGS) $(SWSCALE_CFLAGS) $(AVUTIL_CFLAGS) $(AVRESAMPLE_CFALGS)
+mod_avformat_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(AVFORMAT_LIBS) $(AVCODEC_LIBS) $(SWSCALE_LIBS)  $(AVUTIL_LIBS) $(AVRESAMPLE_LIBS)
 mod_avformat_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lm -lz
 
 else