[FFmpeg-cvslog] doc/protocols: document experimental mutli-client api

Stephan Holljes git at videolan.org
Sat Aug 1 03:24:00 CEST 2015

ffmpeg | branch: master | Stephan Holljes <klaxa1337 at googlemail.com> | Fri Jul  3 02:38:20 2015 +0200| [1d46e0ee051aa9227ddb3f608732e3f86ac85c66] | committer: Stephan Holljes

doc/protocols: document experimental mutli-client api

Signed-off-by: Stephan Holljes <klaxa1337 at googlemail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d46e0ee051aa9227ddb3f608732e3f86ac85c66

 doc/protocols.texi |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/protocols.texi b/doc/protocols.texi
index f152f5a..905bc09 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.
 # Server side (sending):
 ffmpeg -i somefile.ogg -c copy -listen 1 -f ogg http://@var{server}:@var{port}

More information about the ffmpeg-cvslog mailing list