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/io.cpp
This commit is contained in:
Thulinma 2015-10-08 13:58:43 +02:00
commit c390035523
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/output/output.cpp
View file

@ -131,7 +131,7 @@ namespace Mist {
metaPages.clear();
metaPages[0].init(pageId, DEFAULT_META_PAGE_SIZE);
if (!metaPages[0].mapped){
DEBUG_MSG(DLVL_FAIL, "Could not connect to server for %s\n", streamName.c_str());
FAIL_MSG("Could not connect to server for %s", streamName.c_str());
onFail();
return;
}

2
src/output/output_hds.cpp
View file

@ -214,7 +214,7 @@ namespace Mist {
temp = H.url.find("Seg") + 3;
temp = H.url.find("Frag") + 4;
fragNum = atoi(H.url.substr(temp).c_str()) - 1;
DEBUG_MSG(DLVL_MEDIUM, "Video track %d, fragment %d\n", tid, fragNum);
DEBUG_MSG(DLVL_MEDIUM, "Video track %d, fragment %d", tid, fragNum);
if (!audioTrack){getTracks();}
unsigned int mstime = 0;
unsigned int mslen = 0;

2
src/output/output_rtmp.cpp
View file

@ -842,7 +842,7 @@ namespace Mist {
case 18: {//meta data
static std::map<unsigned int, AMF::Object> pushMeta;
if (!isInitialized) {
DEBUG_MSG(DLVL_MEDIUM, "Received useless media data\n");
MEDIUM_MSG("Received useless media data");
myConn.close();
break;
}