Merge commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b'

[ffmpeg] / doc / protocols.texi

diff --git a/doc/protocols.texi b/doc/protocols.texi
index f152f5a26e991e75cf6cab3757d1841a4b79441c..905bc0979ff295a4acb5a92143fd52220ce622be 100644 (file)
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -304,6 +304,8 @@ autodetection in the future.
 If set to 1 enables experimental HTTP server. This can be used to send data when
 used as an output option, or read data from a client with HTTP POST when used as
 an input option.
+If set to 2 enables experimental mutli-client HTTP server. This is not yet implemented
+in ffmpeg.c or ffserver.c and thus must not be used as a command line option.
 @example
 # Server side (sending):
 ffmpeg -i somefile.ogg -c copy -listen 1 -f ogg http://@var{server}:@var{port}