summaryrefslogtreecommitdiff
path: root/doc/ffserver.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/ffserver.texi')
-rw-r--r--doc/ffserver.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 3ff275d8e2..1b9a494f49 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -23,6 +23,7 @@ ffserver [options]
@c man begin DESCRIPTION
ffserver is a streaming server for both audio and video. It supports
+
several live feeds, streaming from files and time shifting on live feeds
(you can seek to positions in the past on each live feed, provided you
specify a big enough feed storage in ffserver.conf).