Merge branch 'loki-47-6F-64:master' into web-ui

This commit is contained in:
Elia Zammuto
2021-05-09 18:59:36 +02:00
22 changed files with 973 additions and 395 deletions

View File

@@ -128,6 +128,10 @@ int main(int argc, char *argv[]) {
proc::refresh(config::stream.file_apps);
auto deinit_guard = platf::init();
if(!deinit_guard) {
return 4;
}
input::init();
reed_solomon_init();
if(video::init()) {
@@ -141,6 +145,8 @@ int main(int argc, char *argv[]) {
stream::rtpThread(shutdown_event);
httpThread.join();
task_pool.stop();
task_pool.join();
return 0;
}