diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-18 15:47:05 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-18 15:47:54 +0100 |
| commit | 299d4f9428c2f4d16a1575d80d80caacdd850606 (patch) | |
| tree | 79ed46565ed50be08459daa2d66f5f5789fb625d /doc/protocols.texi | |
| parent | 4eef36a4f6db1feb9d628337bd96e07a9b482c1a (diff) | |
| parent | ccea588f831906084b8c8235222920e6984beb72 (diff) | |
| download | ffmpeg-299d4f9428c2f4d16a1575d80d80caacdd850606.tar.gz | |
Merge commit 'ccea588f831906084b8c8235222920e6984beb72'
* commit 'ccea588f831906084b8c8235222920e6984beb72':
avio: Add an option 'rw_timeout'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'doc/protocols.texi')
| -rw-r--r-- | doc/protocols.texi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 375d0428ae..cfd7be7cf3 100644 --- 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 |