aboutsummaryrefslogtreecommitdiffstats
path: root/doc/protocols.texi
diff options
context:
space:
mode:
authorStephan Holljes <klaxa1337@googlemail.com>2015-07-03 02:38:20 +0200
committerStephan Holljes <klaxa1337@googlemail.com>2015-08-01 00:58:31 +0200
commit1d46e0ee051aa9227ddb3f608732e3f86ac85c66 (patch)
treea2216268b3016ff287850d66b0cb5dabaf35787c /doc/protocols.texi
parent3240e69de6d37155bfdaf61a9828bfa0a296c326 (diff)
downloadffmpeg-1d46e0ee051aa9227ddb3f608732e3f86ac85c66.tar.gz
doc/protocols: document experimental mutli-client api
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Diffstat (limited to 'doc/protocols.texi')
-rw-r--r--doc/protocols.texi2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index f152f5a26e..905bc0979f 100644
--- 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}