Merge branch 'development' into LTS_development

# Conflicts: # lib/http_parser.cpp
2020-03-03 12:28:04 +01:00 · 2020-03-03 12:28:04 +01:00 · eb8694052d
commit eb8694052d
parent c528e51e7c 27a2e596fd
17 changed files with 401 additions and 304 deletions
--- a/src/input/input_balancer.cpp
+++ b/src/input/input_balancer.cpp
@ -2,6 +2,7 @@
 #include <mist/stream.h>
 #include <mist/http_parser.h>
 #include <mist/encode.h>
+#include <mist/url.h>
 #include "input_balancer.h"

 namespace Mist {
--- a/src/input/input_rtsp.h
+++ b/src/input/input_rtsp.h
@ -4,6 +4,7 @@
 #include <mist/nal.h>
 #include <mist/rtp.h>
 #include <mist/sdp.h>
+#include <mist/url.h>
 #include <set>
 #include <string>