summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2015-02-12 11:59:22 +0100
committerClément Bœsch <clement@stupeflix.com>2015-02-12 11:59:22 +0100
commita5c9befbf433fc63aef9dca598f762339f3a19f3 (patch)
treea537d41f5c573796a4462abd4347ad0774c1d3c8 /README.md
parente1ca695d2207413ad60c56d8deca00e914802743 (diff)
downloadffmpeg-a5c9befbf433fc63aef9dca598f762339f3a19f3.tar.gz
README: add ffserver
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/README.md b/README.md
index 962f7b7e78..58e1eff03c 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,8 @@ such as audio, video, subtitles and related metadata.
* [ffplay](http://ffmpeg.org/ffplay.html) is a minimalistic multimedia player.
* [ffprobe](http://ffmpeg.org/ffprobe.html) is a simple analysis tool to inspect
multimedia content.
+* [ffserver](http://ffmpeg.org/ffserver.html) is a multimedia streaming server
+ for live broadcasts.
* Additional small tools such as `aviocat`, `ismindex` and `qt-faststart`.
## Documentation