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 2018-11-19 14:04:06 +01:00
commit e00247af87
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/flv_tag.cpp
View file

@ -396,6 +396,8 @@ FLV::Tag::~Tag() {
/// This operator checks for self-assignment. /// This operator checks for self-assignment.
FLV::Tag & FLV::Tag::operator=(const FLV::Tag & O) { FLV::Tag & FLV::Tag::operator=(const FLV::Tag & O) {
if (this != &O) { //no self-assignment if (this != &O) { //no self-assignment
done = true;
sofar = 0;
len = O.len; len = O.len;
if (len > 0) { if (len > 0) {
if (checkBufferSize()) { if (checkBufferSize()) {

3
src/input/input_flv.cpp
View file

@ -96,10 +96,12 @@ namespace Mist {
bench = Util::getMicros(bench); bench = Util::getMicros(bench);
INFO_MSG("Header generated in %llu ms: @%lld, %s, %s", bench/1000, lastBytePos, myMeta.vod?"VoD":"NOVoD", myMeta.live?"Live":"NOLive"); INFO_MSG("Header generated in %llu ms: @%lld, %s, %s", bench/1000, lastBytePos, myMeta.vod?"VoD":"NOVoD", myMeta.live?"Live":"NOLive");
if (FLV::Parse_Error){ if (FLV::Parse_Error){
tmpTag = FLV::Tag();
FLV::Parse_Error = false; FLV::Parse_Error = false;
ERROR_MSG("Stopping at FLV parse error @%lld: %s", lastBytePos, FLV::Error_Str.c_str()); ERROR_MSG("Stopping at FLV parse error @%lld: %s", lastBytePos, FLV::Error_Str.c_str());
} }
myMeta.toFile(config->getString("input") + ".dtsh"); myMeta.toFile(config->getString("input") + ".dtsh");
Util::fseek(inFile, 13, SEEK_SET);
return true; return true;
} }
@ -126,6 +128,7 @@ namespace Mist {
} }
if (FLV::Parse_Error){ if (FLV::Parse_Error){
FLV::Parse_Error = false; FLV::Parse_Error = false;
tmpTag = FLV::Tag();
FAIL_MSG("FLV error @ %lld: %s", lastBytePos, FLV::Error_Str.c_str()); FAIL_MSG("FLV error @ %lld: %s", lastBytePos, FLV::Error_Str.c_str());
thisPacket.null(); thisPacket.null();
return; return;

1
src/output/output.cpp
View file

@ -182,7 +182,6 @@ namespace Mist{
isInitialized = false; isInitialized = false;
wantRequest = true; wantRequest = true;
parseData= false; parseData= false;
streamName.clear();
myConn.close(); myConn.close();
} }