kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Michael Jerris 2015-05-04 12:40:01 -05:00
parent b29174e822
commit f87f725e43
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -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])])

4
src/mod/formats/mod_avformat/Makefile.am
View 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)
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