external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Always enable SRS_HLS

Browse source
This commit is contained in:
winlin 2018-12-22 19:54:10 +08:00
parent f003ba9a29
commit 71f1ccbf90
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
trunk/auto/auto_headers.sh
View file

@ -97,12 +97,6 @@ else
srs_undefine_macro "SRS_AUTO_NGINX" $SRS_AUTO_HEADERS_H srs_undefine_macro "SRS_AUTO_NGINX" $SRS_AUTO_HEADERS_H
fi fi
if [ $SRS_HLS = YES ]; then
srs_define_macro "SRS_AUTO_HLS" $SRS_AUTO_HEADERS_H
else
srs_undefine_macro "SRS_AUTO_HLS" $SRS_AUTO_HEADERS_H
fi
if [ $SRS_HDS = YES ]; then if [ $SRS_HDS = YES ]; then
srs_define_macro "SRS_AUTO_HDS" $SRS_AUTO_HEADERS_H srs_define_macro "SRS_AUTO_HDS" $SRS_AUTO_HEADERS_H
else else

2
trunk/src/main/srs_main_server.cpp
View file

@ -214,7 +214,7 @@ void show_macro_features()
// rch(rtmp complex handshake) // rch(rtmp complex handshake)
ss << ", rch:" << srs_bool2switch(SRS_AUTO_SSL_BOOL); ss << ", rch:" << srs_bool2switch(SRS_AUTO_SSL_BOOL);
ss << ", dash:" << "on"; ss << ", dash:" << "on";
ss << ", hls:" << srs_bool2switch(SRS_AUTO_HLS_BOOL); ss << ", hls:" << srs_bool2switch(true);
ss << ", hds:" << srs_bool2switch(SRS_AUTO_HDS_BOOL); ss << ", hds:" << srs_bool2switch(SRS_AUTO_HDS_BOOL);
// hc(http callback) // hc(http callback)
ss << ", hc:" << srs_bool2switch(true); ss << ", hc:" << srs_bool2switch(true);