aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Utkin <andrey.krieger.utkin@gmail.com>2012-09-13 03:43:29 +0300
committerMichael Niedermayer <michaelni@gmx.at>2012-09-15 16:26:00 +0200
commitaa7c88df50eeec6829cd8fc2d397693a0b0be1b2 (patch)
tree4e08ea656bf6861ff0ca22e30520a81c1c322372
parenta9e481771630a1db983c1195dd7f63370ac8a84d (diff)
downloadffmpeg-aa7c88df50eeec6829cd8fc2d397693a0b0be1b2.tar.gz
Document tcp proto 'timeout' parameter behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/protocols.texi5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 0ad985c20a..e7904590d2 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -578,6 +578,11 @@ tcp://@var{hostname}:@var{port}[?@var{options}]
@item listen
Listen for an incoming connection
+@item timeout=@var{microseconds}
+In read mode: if no data arrived in more than this time interval, raise error.
+In write mode: if socket cannot be written in more than this time interval, raise error.
+This also sets timeout on TCP connection establishing.
+
@example
ffmpeg -i @var{input} -f @var{format} tcp://@var{hostname}:@var{port}?listen
ffplay tcp://@var{hostname}:@var{port}