Merge commit 'ccea588f831906084b8c8235222920e6984beb72'

[ffmpeg] / doc / protocols.texi

diff --git a/doc/protocols.texi b/doc/protocols.texi
index 375d0428aea9b08f43c04af396711ae71403115e..cfd7be7cf3d81c954ed7c2ea2c3446708a41af02 100644 (file)
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -36,6 +36,14 @@ particular protocol using the option
 The option "-protocols" of the ff* tools will display the list of
 supported protocols.
 
+All protocols accept the following options:
+
+@table @option
+@item rw_timeout
+Maximum time to wait for (network) read/write operations to complete,
+in microseconds.
+@end table
+
 A description of the currently available protocols follows.
 
 @section async