diff --git a/.gitignore b/.gitignore index 1c94c929..7215b2eb 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,3 @@ server.html* .settings .cproject .project - diff --git a/src/Makefile.am b/src/Makefile.am index 85787281..325286fe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,7 +17,6 @@ bin_PROGRAMS=MistBuffer MistController MistConnRAW MistConnRTMP MistConnHTTP Mis MistBuffer_SOURCES=buffer/buffer.cpp buffer/buffer_user.h buffer/buffer_user.cpp buffer/buffer_stream.h buffer/buffer_stream.cpp tinythread.cpp tinythread.h ../VERSION MistBuffer_LDADD=$(MIST_LIBS) -lpthread MistPlayer_SOURCES=buffer/player.cpp -MistPlayer_LDADD=$(MIST_LIBS) #controller folder (MistController) MistController_SOURCES=controller/controller.cpp controller/controller_connectors.h controller/controller_connectors.cpp controller/controller_storage.h controller/controller_storage.cpp controller/controller_streams.h controller/controller_streams.cpp controller/controller_capabilities.h controller/controller_capabilities.cpp ../VERSION controller/server.html.h diff --git a/src/connectors/conn_http_dynamic.cpp b/src/connectors/conn_http_dynamic.cpp index 5cafed0b..0874898e 100644 --- a/src/connectors/conn_http_dynamic.cpp +++ b/src/connectors/conn_http_dynamic.cpp @@ -38,7 +38,7 @@ namespace Connector_HTTP { asrt.setVersion(1); //asrt.setQualityEntry(empty, 0); if (metadata.isMember("live")){ - asrt.setSegmentRun(1, 4294967295, 0); + asrt.setSegmentRun(1, 4294967295ul, 0); }else{ asrt.setSegmentRun(1, metadata["keytime"].size(), 0); }