[FFmpeg-cvslog] doc/protocols/tcp: fix units of listen_timeout option value, from microseconds to milliseconds

Stefano Sabatini git at videolan.org
Sun Mar 29 03:41:17 CEST 2015


ffmpeg | branch: release/2.4 | Stefano Sabatini <stefasab at gmail.com> | Thu Mar  5 12:05:17 2015 +0100| [99de009e97d079dede1eb7a11525c69ddc44ed1e] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99de009e97d079dede1eb7a11525c69ddc44ed1e
---

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

diff --git a/doc/protocols.texi b/doc/protocols.texi
index dc2fdb1..702f157 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -1081,8 +1081,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.
 
- at item listen_timeout=@var{microseconds}
-Set listen timeout, expressed in microseconds.
+ at item listen_timeout=@var{milliseconds}
+Set listen timeout, expressed in milliseconds.
 @end table
 
 The following example shows how to setup a listening TCP connection



More information about the ffmpeg-cvslog mailing list