summaryrefslogtreecommitdiff
path: root/doc/ffserver.txt
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2002-05-20 16:22:05 +0000
committerFabrice Bellard <fabrice@bellard.org>2002-05-20 16:22:05 +0000
commit44defcfb861413714b259b3cca19e11a1cf25e4e (patch)
tree39dbdce0896d89fb377dabed4fd27f465a8d1a13 /doc/ffserver.txt
parent4196dcd621930e2ed3c2ffa67607c338c0e09a9e (diff)
update
Originally committed as revision 539 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffserver.txt')
-rw-r--r--doc/ffserver.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ffserver.txt b/doc/ffserver.txt
index 7019556043..6b1228870c 100644
--- a/doc/ffserver.txt
+++ b/doc/ffserver.txt
@@ -43,7 +43,7 @@ MPEG file.
etc...
- Note that ffserver generate multiple streams in multiple formats AT
+ Note that ffserver generates multiple streams in multiple formats AT
THE SAME TIME. It should be able to handle hundreds of users at the
same time if you internet connection is fast enough.