diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/developer.texi | 4 | ||||
-rw-r--r-- | doc/protocols.texi | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index 964c9af4c1..96e77aeaf2 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -204,8 +204,8 @@ For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}: (c-add-style "ffmpeg" '("k&r" (c-basic-offset . 4) - (indent-tabs-mode nil) - (show-trailing-whitespace t) + (indent-tabs-mode . nil) + (show-trailing-whitespace . t) (c-offsets-alist (statement-cont . (c-lineup-assignments +))) ) diff --git a/doc/protocols.texi b/doc/protocols.texi index c8baa13acb..883c2e46c1 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -218,6 +218,11 @@ application specified in @var{app}, may be prefixed by "mp4:". You can override the value parsed from the URI through the @code{rtmp_playpath} option, too. +@item listen +Act as a server, listening for an incoming connection. + +@item timeout +Maximum time to wait for the incoming connection. Implies listen. @end table Additionally, the following parameters can be set via command line options |