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/controller/controller_statistics.cpp
#	src/input/input_buffer.cpp
#	src/input/input_dtsc.cpp
#	src/input/input_ebml.cpp
#	src/input/input_flv.cpp
#	src/input/input_mp3.cpp
#	src/output/output_httpts.cpp
#	src/output/output_progressive_mp3.cpp
#	src/output/output_progressive_mp4.cpp
This commit is contained in:
Thulinma 2019-01-25 23:57:42 +01:00
commit 9e1539a2b9
32 changed files with 95 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/dtsc.h
View file

@ -334,8 +334,8 @@ namespace DTSC {
std::string getIdentifier();
std::string getWritableIdentifier();
unsigned int trackID;
unsigned long long firstms;
unsigned long long lastms;
uint64_t firstms;
uint64_t lastms;
int bps;
int max_bps;
int missedFrags;
@ -393,8 +393,8 @@ namespace DTSC {
bool live;
bool merged;
uint16_t version;
long long int moreheader;
long long int bufferWindow;
int64_t moreheader;
int64_t bufferWindow;
int64_t bootMsOffset;///< Millis to add to packet timestamps to get millis since system boot.
std::string sourceURI;
JSON::Value inputLocalVars;