Merge branch '4.0release' into merge/develop

3 years ago · f7b86a5b8d
parent 5e453f0bab 79d73bafcf
commit f7b86a5b8d
1 changed files with 43 additions and 42 deletions
--- a/trunk/src/app/srs_app_http_static.cpp
+++ b/trunk/src/app/srs_app_http_static.cpp
@ -36,6 +36,7 @@ using namespace std;
 #include <srs_service_utility.hpp>
 #include <srs_app_http_hooks.hpp>
 #include <srs_app_statistic.hpp>
+#include <srs_app_hybrid.hpp>

 #define SRS_CONTEXT_IN_HLS "hls_ctx"