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

FS-7519: [mod_avcodec] add x264 to linker

This commit is contained in:
Michael Jerris 2015-05-04 15:46:53 -04:00
parent 5220c91395
commit d2d00056e8
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

@ -1267,6 +1267,10 @@ PKG_CHECK_MODULES([AVCODEC], [libavcodec >= 53.35.0],[
AM_CONDITIONAL([HAVE_AVCODEC],[true])],[ AM_CONDITIONAL([HAVE_AVCODEC],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AVCODEC],[false])]) AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AVCODEC],[false])])
PKG_CHECK_MODULES([X264], [x264 >= 0.142.2431],[
AM_CONDITIONAL([HAVE_X264],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_X264],[false])])
PKG_CHECK_MODULES([AVFORMAT], [libavformat >= 53.21.1],[ PKG_CHECK_MODULES([AVFORMAT], [libavformat >= 53.21.1],[
AM_CONDITIONAL([HAVE_AVFORMAT],[true])],[ AM_CONDITIONAL([HAVE_AVFORMAT],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AVFORMAT],[false])]) AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AVFORMAT],[false])])

4
src/mod/codecs/mod_avcodec/Makefile.am
View File

@ -5,8 +5,8 @@ if HAVE_AVCODEC
mod_LTLIBRARIES = mod_avcodec.la mod_LTLIBRARIES = mod_avcodec.la
mod_avcodec_la_SOURCES = mod_avcodec.c mod_avcodec_la_SOURCES = mod_avcodec.c
mod_avcodec_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS) $(AVUTIL_CFLAGS) mod_avcodec_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS) $(AVUTIL_CFLAGS) $(X264_CFLAGS)
mod_avcodec_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) mod_avcodec_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(X264_LIBS)
mod_avcodec_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm -lz mod_avcodec_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm -lz
else else