diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 23:20:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 23:20:39 +0100 |
| commit | c5c4e5839ad1459bdbd69ffa7d33949577662a6c (patch) | |
| tree | 14d617f6e00b12a8698572e4d025ba77f96607fe | |
| parent | 1fb3642317768c02db0eaf8d0d118d37a970f091 (diff) | |
| parent | e14f98c62fdf8744b07419314095d1b3248cce75 (diff) | |
| download | ffmpeg-c5c4e5839ad1459bdbd69ffa7d33949577662a6c.tar.gz | |
Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75'
* commit 'e14f98c62fdf8744b07419314095d1b3248cce75':
tcp: Clarify the units for the timeout avoptions
Conflicts:
libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 0aabc9db07..4016c0e1ac 100644 --- 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 } }; |