FS-7519: [mod_avformat] add libswscale and libavcodec to linking deps

diff --git a/configure.ac b/configure.ac
index 9758d9486a03d368f5291d8031964d473a684a2e..0709635de8240d622d410785bca3dff0d59fdc12 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1271,6 +1271,10 @@ 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([SWSCALE], [libswscale >= 3.0.0],[
+  AM_CONDITIONAL([HAVE_SWSCALE],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SWSCALE],[false])])
+
 PKG_CHECK_MODULES([VLC], [libvlc >= 2.1.0],[
   AM_CONDITIONAL([HAVE_VLC],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_VLC],[false])])

diff --git a/src/mod/formats/mod_avformat/Makefile.am b/src/mod/formats/mod_avformat/Makefile.am
index c8fd5bd4a100f89dd5b216bb3441aa28c559dd89..33459ee59a5c6dda9081c0c8be3f2d4f026eb1f1 100644 (file)
--- a/src/mod/formats/mod_avformat/Makefile.am
+++ b/src/mod/formats/mod_avformat/Makefile.am
@@ -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)
-mod_avformat_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(AVFORMAT_LIBS)
+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_LDFLAGS  = -avoid-version -module -no-undefined -shared -lm -lz
 
 else