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>

diff --git a/doc/protocols.texi b/doc/protocols.texi
index 5e8c97d1649858caba6a6d027fe40c2c690d6f2e..57814c783193dd711c6124850e10ff54f0174aa7 100644 (file)
--- 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 1d748f0e81a99317b0e19962e5e66c8cc2f5836b..378acb045a603bb1c94f6d15475d95618943da0f 100644 (file)
--- 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 },