[FFmpeg-cvslog] lavf/tcp: Clarify that the -timeout option takes microseconds.
Carl Eugen Hoyos
git at videolan.org
Wed Nov 12 13:53:42 CET 2014
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Nov 12 13:52:56 2014 +0100| [1f4bce894a152b48fe0274061b88b75de1e1f74f] | committer: Carl Eugen Hoyos
lavf/tcp: Clarify that the -timeout option takes microseconds.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f4bce894a152b48fe0274061b88b75de1e1f74f
---
libavformat/tcp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index a1b1856..0aabc9d 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -45,7 +45,7 @@ typedef struct TCPContext {
#define E AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
{ "listen", "Listen for incoming connections", OFFSET(listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = D|E },
- { "timeout", "set timeout of socket I/O operations", OFFSET(rw_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E },
+ { "timeout", "set timeout (in microseconds) of socket I/O operations", OFFSET(rw_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E },
{ "listen_timeout", "Connection awaiting timeout", OFFSET(listen_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E },
{ NULL }
};
More information about the ffmpeg-cvslog
mailing list