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

Two small fixes to repair rtmp re-pushing

Browse source
This commit is contained in:
Erik Zandvliet 2014-06-23 15:07:43 +02:00
parent 1a3c23d5d7
commit fefd0e2f6f
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/input/input_buffer.cpp
View file

@ -222,6 +222,7 @@ namespace Mist {
INFO_MSG("Re-push initiated for track %lu, from user %u, will replace final track number %d", value, id, finalMap); INFO_MSG("Re-push initiated for track %lu, from user %u, will replace final track number %d", value, id, finalMap);
myMeta.tracks.erase(finalMap); myMeta.tracks.erase(finalMap);
dataPages.erase(finalMap); dataPages.erase(finalMap);
inputLoc.erase(finalMap);
} }
} }
givenTracks.insert(finalMap); givenTracks.insert(finalMap);

1
src/output/output_rtmp.cpp
View file

@ -777,6 +777,7 @@ namespace Mist {
counter++; counter++;
if (counter > 8){ if (counter > 8){
sending = true; sending = true;
myMeta = meta_out;
negotiatePushTracks(); negotiatePushTracks();
for (std::deque<JSON::Value>::iterator it = preBuf.begin(); it != preBuf.end(); it++){ for (std::deque<JSON::Value>::iterator it = preBuf.begin(); it != preBuf.end(); it++){
bufferPacket((*it)); bufferPacket((*it));