From 1b5e19d4e7b2dc7bc5d0d4ab081f508daee482e2 Mon Sep 17 00:00:00 2001
From: Roman Arutyunyan <arut@qip.ru>
Date: Sat, 30 Nov 2013 11:32:21 +0400
Subject: [PATCH] updated readme

---
 README.md     | 23 +++++++++++++++--------
 hls/README.md |  1 -
 2 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 hls/README.md

diff --git a/README.md b/README.md
index ab7f92a..092d483 100644
--- a/README.md
+++ b/README.md
@@ -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;
+            }
         }
     }
 
diff --git a/hls/README.md b/hls/README.md
deleted file mode 100644
index 385c5d5..0000000
--- a/hls/README.md
+++ /dev/null
@@ -1 +0,0 @@
-HLS is now a part of rtmp module