hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output_hss.cpp
#	src/output/output_rtmp.cpp
This commit is contained in:
Thulinma 2016-04-14 12:05:55 +02:00
commit d20c4f5ec5
9 changed files with 198 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -116,7 +116,7 @@ set(libHeaders
${SOURCE_DIR}/lib/adts.h
${SOURCE_DIR}/lib/amf.h
${SOURCE_DIR}/lib/auth.h
${SOURCE_DIR}/lib/base64.h
${SOURCE_DIR}/lib/encode.h
${SOURCE_DIR}/lib/bitfields.h
${SOURCE_DIR}/lib/bitstream.h
${SOURCE_DIR}/lib/checksum.h
@ -161,7 +161,7 @@ set(libSources
${SOURCE_DIR}/lib/adts.cpp
${SOURCE_DIR}/lib/amf.cpp
${SOURCE_DIR}/lib/auth.cpp
${SOURCE_DIR}/lib/base64.cpp
${SOURCE_DIR}/lib/encode.cpp
${SOURCE_DIR}/lib/bitfields.cpp
${SOURCE_DIR}/lib/bitstream.cpp
${SOURCE_DIR}/lib/config.cpp