diff options
| author | Marton Balint <cus@passwd.hu> | 2020-02-13 23:50:32 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2020-02-24 00:02:45 +0100 |
| commit | 006744bdbd83d98bc71cb041d9551bf6a64b45a2 (patch) | |
| tree | a01df65ec0cb9f22b2c8522286180ca9ffa11c79 | |
| parent | b96bc946f219fbd28cffc1efea78fd42f34148ec (diff) | |
| download | ffmpeg-006744bdbd83d98bc71cb041d9551bf6a64b45a2.tar.gz | |
avformat/libsrt: fix name of timeout option
rw_timeout is the generic URLcontext option, not the protocol specific timeout
option, also ?rw_timeout never worked because ?timeout was parsed instead.
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | doc/protocols.texi | 2 | ||||
| -rw-r--r-- | libavformat/libsrt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 5e8c97d164..57814c7831 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1347,7 +1347,7 @@ Set UDP receive buffer size, expressed in bytes. @item send_buffer_size=@var{bytes} Set UDP send buffer size, expressed in bytes. -@item rw_timeout +@item timeout Set raise error timeout for read/write optations. This option is only relevant in read mode: diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 1d748f0e81..378acb045a 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -96,7 +96,7 @@ typedef struct SRTContext { #define E AV_OPT_FLAG_ENCODING_PARAM #define OFFSET(x) offsetof(SRTContext, x) static const AVOption libsrt_options[] = { - { "rw_timeout", "Timeout of socket I/O operations", OFFSET(rw_timeout), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, .flags = D|E }, + { "timeout", "Timeout of socket I/O operations", OFFSET(rw_timeout), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, .flags = D|E }, { "listen_timeout", "Connection awaiting timeout", OFFSET(listen_timeout), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, .flags = D|E }, { "send_buffer_size", "Socket send buffer size (in bytes)", OFFSET(send_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "recv_buffer_size", "Socket receive buffer size (in bytes)", OFFSET(recv_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, |