OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1ee9341
)
doc/ffserver: fix documentation for -n option
author
Stefano Sabatini
<stefasab@gmail.com>
Thu, 28 Nov 2013 17:55:11 +0000
(18:55 +0100)
committer
Stefano Sabatini
<stefasab@gmail.com>
Thu, 28 Nov 2013 17:59:29 +0000
(18:59 +0100)
Launch option is defined in the Feed section.
doc/ffserver.texi
patch
|
blob
|
history
diff --git
a/doc/ffserver.texi
b/doc/ffserver.texi
index
31039ad
..
1506742
100644
(file)
--- a/
doc/ffserver.texi
+++ b/
doc/ffserver.texi
@@
-199,7
+199,7
@@
read by default from @file{/etc/ffserver.conf}.
@item -n
Enable no-launch mode. This option disables all the @code{Launch}
-directives within the various @code{<
Stream
>} sections. Since
+directives within the various @code{<
Feed
>} sections. Since
@command{ffserver} will not launch any @command{ffmpeg} instances, you
will have to launch them manually.