diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index a0730b65c..9f06b6b03 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -448,18 +448,6 @@ vhost with-hls.srs.com { # if off, donot write hls(ts and m3u8) when publish. # default: off enabled on; - # the hls output path. - # the app dir is auto created under the hls_path. - # for example, for rtmp stream: - # rtmp://127.0.0.1/live/livestream - # http://127.0.0.1/live/livestream.m3u8 - # where hls_path is /hls, srs will create the following files: - # /hls/live the app dir for all streams. - # /hls/live/livestream.m3u8 the HLS m3u8 file. - # /hls/live/livestream-1.ts the HLS media/ts file. - # in a word, the hls_path is for vhost. - # default: ./objs/nginx/html - hls_path ./objs/nginx/html; # the hls fragment in seconds, the duration of a piece of ts. # default: 10 hls_fragment 10; @@ -473,6 +461,18 @@ vhost with-hls.srs.com { # @see https://github.com/winlinvip/simple-rtmp-server/issues/264 # default: ignore hls_on_error ignore; + # the hls output path. + # the app dir is auto created under the hls_path. + # for example, for rtmp stream: + # rtmp://127.0.0.1/live/livestream + # http://127.0.0.1/live/livestream.m3u8 + # where hls_path is /hls, srs will create the following files: + # /hls/live the app dir for all streams. + # /hls/live/livestream.m3u8 the HLS m3u8 file. + # /hls/live/livestream-1.ts the HLS media/ts file. + # in a word, the hls_path is for vhost. + # default: ./objs/nginx/html + hls_path ./objs/nginx/html; } } # the vhost with hls disabled. diff --git a/trunk/conf/hls.conf b/trunk/conf/hls.conf index 375bc3629..0263b7ea7 100644 --- a/trunk/conf/hls.conf +++ b/trunk/conf/hls.conf @@ -7,8 +7,8 @@ max_connections 1000; vhost __defaultVhost__ { hls { enabled on; - hls_path ./objs/nginx/html; hls_fragment 10; hls_window 60; + hls_path ./objs/nginx/html; } }