Merge commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a'

[ffmpeg] / README.md

diff --git a/README.md b/README.md
index 04089e4a1cfd77e1b95e35703341f05a0555ed74..58e1eff03c55de4fcbab5639cbf1a6f0e611b03e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -19,8 +19,10 @@ such as audio, video, subtitles and related metadata.
 * [ffmpeg](http://ffmpeg.org/ffmpeg.html) is a command line toolbox to
   manipulate, convert and stream multimedia content.
 * [ffplay](http://ffmpeg.org/ffplay.html) is a minimalistic multimedia player.
-* [ffprobe](http://ffmpeg.org/ffprobe.html) is a simple analisys tool to inspect
+* [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