aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-11-12 13:52:56 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-11-12 13:52:56 +0100
commit1f4bce894a152b48fe0274061b88b75de1e1f74f (patch)
tree50632b662f0fcdd0d2918418a9414311adbf27ce
parent0ea54d698be613465d92a82495001ddabae128b0 (diff)
downloadffmpeg-1f4bce894a152b48fe0274061b88b75de1e1f74f.tar.gz
lavf/tcp: Clarify that the -timeout option takes microseconds.
-rw-r--r--libavformat/tcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index a1b185635c..0aabc9db07 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 }
};