diff options
author | Stefano Sabatini <stefasab@gmail.com> | 2013-11-28 20:27:01 +0400 |
---|---|---|
committer | Stefano Sabatini <stefasab@gmail.com> | 2013-11-28 20:28:22 +0400 |
commit | b89983c4ead6e0b7258df9c1bff4317032ff4cae (patch) | |
tree | 483ae9ecee51dfe13e0a5903a2fe6c33bf44e6c6 /doc/ffserver.texi | |
parent | bb097d037cd42c88781c3d34a49d80370ff553b0 (diff) |
doc/ffserver: clearly specify whence ffserver reads the configuration file
Diffstat (limited to 'doc/ffserver.texi')
-rw-r--r-- | doc/ffserver.texi | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi index a408ca8159..11f6d68f4e 100644 --- a/doc/ffserver.texi +++ b/doc/ffserver.texi @@ -16,11 +16,14 @@ ffserver [@var{options}] @chapter Description @c man begin DESCRIPTION -@command{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 -@file{ffserver.conf}). +@command{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. + +@command{ffserver} is configured through a configuration file, which +is read at startup. If not explicitly specified, it will read from +@file{/etc/ffserver.conf}. @command{ffserver} receives prerecorded files or FFM streams from some @command{ffmpeg} instance as input, then streams them over @@ -191,7 +194,8 @@ differing versions of tools. FFM2 is the default. @table @option @item -f @var{configfile} -Use @file{configfile} instead of @file{/etc/ffserver.conf}. +Read configuration file @file{configfile}. If not specified it will +read by default from @file{/etc/ffserver.conf}. @item -n Enable no-launch mode. This option disables all the @code{Launch} |