updated readme

This commit is contained in:
Roman Arutyunyan 2013-11-30 11:32:21 +04:00
parent 831823a772
commit 1b5e19d4e7
2 changed files with 15 additions and 9 deletions

View file

@ -22,9 +22,9 @@
### Features
* Live streaming of video/audio
* RTMP/HLS/MPEG-DASH live streaming
* Video on demand FLV/MP4,
* RTMP Video on demand FLV/MP4,
playing from local filesystem or HTTP
* Stream relay support for distributed
@ -36,8 +36,6 @@
* Online transcoding with FFmpeg
* HLS (HTTP Live Streaming) support
* HTTP callbacks (publish/play/record/update etc)
* Running external programs on certain events (exec)
@ -256,10 +254,16 @@ rtmp_auto_push directive.
application hls {
live on;
hls on;
hls_path /tmp/app;
hls_fragment 5s;
hls_path /tmp/hls;
}
# MPEG-DASH is similar to HLS
application dash {
live on;
dash on;
dash_path /tmp/dash;
}
}
}
@ -292,10 +296,13 @@ rtmp_auto_push directive.
application/vnd.apple.mpegurl m3u8;
video/mp2t ts;
}
alias /tmp/app;
expires -1;
root /tmp;
}
location /dash {
# Serve DASH fragments
root /tmp;
}
}
}

View file

@ -1 +0,0 @@
HLS is now a part of rtmp module