diff --git a/config b/config index 7f8a372..2bdb47f 100644 --- a/config +++ b/config @@ -19,6 +19,7 @@ CORE_MODULES="$CORE_MODULES ngx_rtmp_notify_module \ ngx_rtmp_log_module \ ngx_rtmp_limit_module \ + ngx_rtmp_hls_module \ " @@ -41,6 +42,7 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \ $ngx_addon_dir/ngx_rtmp_record_module.h \ $ngx_addon_dir/ngx_rtmp_relay_module.h \ $ngx_addon_dir/ngx_rtmp_streams.h \ + $ngx_addon_dir/hls/ngx_rtmp_mpegts.h \ " @@ -74,6 +76,8 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \ $ngx_addon_dir/ngx_rtmp_notify_module.c \ $ngx_addon_dir/ngx_rtmp_log_module.c \ $ngx_addon_dir/ngx_rtmp_limit_module.c \ + $ngx_addon_dir/hls/ngx_rtmp_hls_module.c \ + $ngx_addon_dir/hls/ngx_rtmp_mpegts.c \ " CFLAGS="$CFLAGS -I$ngx_addon_dir" diff --git a/hls/README.md b/hls/README.md index df3915f..385c5d5 100644 --- a/hls/README.md +++ b/hls/README.md @@ -1,9 +1 @@ -# HLS (HTTP Live Streaming) module - -This module should be added explicitly when building NGINX: - - ./configure ... --add-module=/path/to/nginx-rtmp-module/hls ... - -## Requirement - -The module requires ffmpeg version>= 53.31.100 from ffmpeg (ffmpeg.org) +HLS is now a part of rtmp module diff --git a/hls/config b/hls/config deleted file mode 100644 index 1b5c83e..0000000 --- a/hls/config +++ /dev/null @@ -1,11 +0,0 @@ -ngx_addon_name="ngx_rtmp_hls_module" - -CORE_MODULES="$CORE_MODULES - ngx_rtmp_hls_module \ - " - - -NGX_ADDON_SRCS="$NGX_ADDON_SRCS \ - $ngx_addon_dir/ngx_rtmp_hls_module.c \ - $ngx_addon_dir/ngx_rtmp_mpegts.c \ - "