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
#	src/output/output_rtmp.cpp
This commit is contained in:
Thulinma 2017-02-28 14:07:18 +01:00
commit daa0833970
6 changed files with 60 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/dtsc.h
View file

@ -365,6 +365,7 @@ namespace DTSC {
uint16_t version;
long long int moreheader;
long long int bufferWindow;
std::string sourceURI;
};
/// An iterator helper for easily iterating over the parts in a Fragment.