Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75'

* commit 'e14f98c62fdf8744b07419314095d1b3248cce75': tcp: Clarify the units for the timeout avoptions Conflicts: libavformat/tcp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · c5c4e5839a
parent 1fb3642317 e14f98c62f
commit c5c4e5839a
1 changed files with 1 additions and 1 deletions
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@ -46,7 +46,7 @@ typedef struct TCPContext {
 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 (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 },
+    { "listen_timeout",  "Connection awaiting timeout (in milliseconds)",      OFFSET(listen_timeout), AV_OPT_TYPE_INT, { .i64 = -1 },         -1, INT_MAX, .flags = D|E },
    { NULL }
 };