aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2015-03-05 12:05:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-14 14:27:23 +0100
commit6155d5d98b1b4fe76c8b1d072c39969068b9ed66 (patch)
tree1d7d3dfd4be2ce25464feb1d864e2e8231ae7a0d
parent7ed19bd337ead0c9bf125432d5fa56ca8415d8be (diff)
downloadffmpeg-6155d5d98b1b4fe76c8b1d072c39969068b9ed66.tar.gz
doc/protocols/tcp: fix units of listen_timeout option value, from microseconds to milliseconds
s->listen_timeout is passed to ff_listen_bind(), which accepts a timeout value expressed in milliseconds. The unit was incorrectly set in 1b4da43ce02452843a1e9bb976da1a39e18a945c. (cherry picked from commit 6db20926c32ea297418f1f819585007c6b7b6160) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/protocols.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 91b8244306..851b3c52d0 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -982,8 +982,8 @@ Set raise error timeout, expressed in microseconds.
This option is only relevant in read mode: if no data arrived in more
than this time interval, raise error.
-@item listen_timeout=@var{microseconds}
-Set listen timeout, expressed in microseconds.
+@item listen_timeout=@var{milliseconds}
+Set listen timeout, expressed in milliseconds.
@end table
The following example shows how to setup a listening TCP connection