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:
#	CMakeLists.txt
#	src/input/input_buffer.cpp
This commit is contained in:
Thulinma 2017-07-22 18:55:12 +02:00
commit d42bf9777e
23 changed files with 381 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -142,6 +142,7 @@ set(libHeaders
${SOURCE_DIR}/lib/h264.h
${SOURCE_DIR}/lib/h265.h
${SOURCE_DIR}/lib/http_parser.h
${SOURCE_DIR}/lib/downloader.h
${SOURCE_DIR}/lib/json.h
${SOURCE_DIR}/lib/langcodes.h
${SOURCE_DIR}/lib/mp4_adobe.h
@ -190,6 +191,7 @@ set(libSources
${SOURCE_DIR}/lib/h264.cpp
${SOURCE_DIR}/lib/h265.cpp
${SOURCE_DIR}/lib/http_parser.cpp
${SOURCE_DIR}/lib/downloader.cpp
${SOURCE_DIR}/lib/json.cpp
${SOURCE_DIR}/lib/langcodes.cpp
${SOURCE_DIR}/lib/mp4_adobe.cpp
@ -350,6 +352,7 @@ if (DEFINED WITH_AV )
endif()
makeInput(OGG ogg)
makeInput(Buffer buffer)
makeInput(H264 h264)
makeInput(ISMV ismv)#LTS
makeInput(MP4 mp4)#LTS
makeInput(TS ts)#LTS