zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-11 06:41:08 +02:00
Code Issues Projects Releases Wiki Activity

removed hls module & added hls code to rtmp module

Browse source
This commit is contained in:
Roman Arutyunyan 2013-03-05 10:40:40 +04:00
parent b40024492e
commit ac5df69487
3 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config
View file

@ -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"

10
hls/README.md
View file

@ -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

11
hls/config
View file

@ -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 \
"