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-04-18 12:32:39 +02:00
commit 7629b00a4c
10 changed files with 65 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/output/output.cpp
View file

@ -328,6 +328,7 @@ namespace Mist{
if (nProxy.userClient.getData()){
nProxy.userClient.finish();
}
nProxy.streamName = streamName;
char userPageName[NAME_BUFFER_SIZE];
snprintf(userPageName, NAME_BUFFER_SIZE, SHM_USERS, streamName.c_str());
unsigned int attempts = 0;

1
src/output/output_rtmp.cpp
View file

@ -1119,7 +1119,6 @@ namespace Mist {
snprintf(userPageName, NAME_BUFFER_SIZE, SHM_USERS, streamName.c_str());
nProxy.userClient = IPC::sharedClient(userPageName, PLAY_EX_SIZE, true);
}
nProxy.streamName = streamName;
bufferLivePacket(thisPacket);
}
break;