diff --git a/trunk/auto/auto_headers.sh b/trunk/auto/auto_headers.sh index e13855a4f..51cf6cebe 100755 --- a/trunk/auto/auto_headers.sh +++ b/trunk/auto/auto_headers.sh @@ -97,12 +97,6 @@ else srs_undefine_macro "SRS_AUTO_NGINX" $SRS_AUTO_HEADERS_H 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 srs_define_macro "SRS_AUTO_HDS" $SRS_AUTO_HEADERS_H else diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index f4c4c69b3..933a5752e 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -214,7 +214,7 @@ void show_macro_features() // rch(rtmp complex handshake) ss << ", rch:" << srs_bool2switch(SRS_AUTO_SSL_BOOL); ss << ", dash:" << "on"; - ss << ", hls:" << srs_bool2switch(SRS_AUTO_HLS_BOOL); + ss << ", hls:" << srs_bool2switch(true); ss << ", hds:" << srs_bool2switch(SRS_AUTO_HDS_BOOL); // hc(http callback) ss << ", hc:" << srs_bool2switch(true);