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_mp4.cpp
This commit is contained in:
Thulinma 2019-07-02 17:24:33 +02:00
commit 0233d5b684
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -390,7 +390,7 @@ makeInput(Buffer buffer)
makeInput(H264 h264) makeInput(H264 h264)
makeInput(EBML ebml) makeInput(EBML ebml)
makeInput(ISMV ismv)#LTS makeInput(ISMV ismv)#LTS
makeInput(MP4 mp4)#LTS makeInput(MP4 mp4)
makeInput(TS ts)#LTS makeInput(TS ts)#LTS
makeInput(Folder folder)#LTS makeInput(Folder folder)#LTS
makeInput(Balancer balancer)#LTS makeInput(Balancer balancer)#LTS