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.h
This commit is contained in:
Thulinma 2017-07-28 18:39:49 +02:00
commit dc8bae8dd3
10 changed files with 80 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/dtsc.h
View file

@ -348,7 +348,7 @@ namespace DTSC {
return vod || live;
}
void reinit(const DTSC::Packet & source);
void update(DTSC::Packet & pack, unsigned long segment_size = 5000);
void update(const DTSC::Packet & pack, unsigned long segment_size = 5000);
void updatePosOverride(DTSC::Packet & pack, uint64_t bpos);
void update(JSON::Value & pack, unsigned long segment_size = 5000);
/*LTS