hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2017-03-07 17:07:05 +01:00
commit 8b62c1c664
5 changed files with 57 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/input/input_flv.cpp
View file

@ -103,6 +103,12 @@ namespace Mist {
void inputFLV::getNext(bool smart) {
long long int lastBytePos = Util::ftell(inFile);
if (selectedTracks.size() == 1){
uint8_t targetTag = 0x08;
if (selectedTracks.count(1)){targetTag = 0x09;}
if (selectedTracks.count(3)){targetTag = 0x12;}
FLV::seekToTagType(inFile, targetTag);
}
while (!feof(inFile) && !FLV::Parse_Error){
if (tmpTag.FileLoader(inFile)){
if ( !selectedTracks.count(tmpTag.getTrackID())){

2
src/sourcery.cpp
View file

@ -8,7 +8,7 @@
int main(int argc, char* argv[]){
if (argc < 4) {
std::cerr << "Usage: " << argv[0] << " <inputFile> <variableName> <outputFile>" << std::endl;
return 1;
return 2;
}
std::ofstream tmp(argv[3]);
//begin the first line