Merge branch 'master' into FTP
This commit is contained in:
commit
f351ca46d8
16 changed files with 397 additions and 848 deletions
|
@ -1,6 +1,7 @@
|
|||
lib_LTLIBRARIES=libmist-1.0.la
|
||||
libmist_1_0_la_SOURCES=amf.h amf.cpp auth.h auth.cpp base64.h base64.cpp config.h config.cpp crypto.h crypto.cpp dtsc.h dtsc.cpp flv_tag.h flv_tag.cpp http_parser.h http_parser.cpp json.h json.cpp procs.h procs.cpp rtmpchunks.h rtmpchunks.cpp socket.h socket.cpp mp4.h mp4.cpp ftp.h ftp.cpp filesystem.h filesystem.cpp
|
||||
libmist_1_0_la_LIBADD=-lssl -lcrypto
|
||||
libmist_1_0_la_LDFLAGS = -version-info 1:0:0
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = mist-1.0.pc
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue