Merge branch '4.0release' into merge/develop

This commit is contained in:
winlin 2021-09-23 22:05:34 +08:00
commit f7b86a5b8d

View File

@ -36,6 +36,7 @@ using namespace std;
#include <srs_service_utility.hpp> #include <srs_service_utility.hpp>
#include <srs_app_http_hooks.hpp> #include <srs_app_http_hooks.hpp>
#include <srs_app_statistic.hpp> #include <srs_app_statistic.hpp>
#include <srs_app_hybrid.hpp>
#define SRS_CONTEXT_IN_HLS "hls_ctx" #define SRS_CONTEXT_IN_HLS "hls_ctx"