[FFmpeg-cvslog] doc/protocols: document unit of timeouts for ftp and http

Lukasz Marek git at videolan.org
Sat Jul 5 12:08:11 CEST 2014


ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2 at gmail.com> | Fri Jul  4 19:58:20 2014 +0200| [362cfe8ce1012ee7ff9fa0503bfcb0c465c9d1b9] | committer: Stefano Sabatini

doc/protocols: document unit of timeouts for ftp and http

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>

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

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

diff --git a/doc/protocols.texi b/doc/protocols.texi
index cd9126c..3e5a707 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -166,7 +166,7 @@ This protocol accepts the following options.
 
 @table @option
 @item timeout
-Set timeout of socket I/O operations used by the underlying low level
+Set timeout in microseconds of socket I/O operations used by the underlying low level
 operation. By default it is set to -1, which means that the timeout is
 not specified.
 
@@ -244,7 +244,7 @@ Override the User-Agent header. If not specified the protocol will use a
 string describing the libavformat build. ("Lavf/<version>")
 
 @item timeout
-Set timeout of socket I/O operations used by the underlying low level
+Set timeout in microseconds of socket I/O operations used by the underlying low level
 operation. By default it is set to -1, which means that the timeout is
 not specified.
 



More information about the ffmpeg-cvslog mailing list