Commit f7bdcef9 authored by Louis-Philippe Véronneau's avatar Louis-Philippe Véronneau

Merge branch 'bugfix/docs-to-hls' into 'master'

docs: the streaming system uses HLS not DASH

See merge request !92
parents b597aaf9 8b6c2366
Pipeline #34604 passed with stages
in 2 minutes and 31 seconds
......@@ -35,7 +35,7 @@ Encoder
Streaming Back-end
This receives the RTMP streams from the rooms, saves these to disk and
presents this over HTTP using DASH in a variety of formats.
presents this over HTTPS using HLS in a variety of formats.
Streaming Front-end
These machines are caching proxies in front of the streaming back-end,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment