summaryrefslogtreecommitdiff
path: root/doc/ffmpeg-doc.texi
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-07-31 15:45:29 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-07-31 15:45:29 +0000
commit1de4cfe6357c93bb2c01a6d48c93f978551e0aa7 (patch)
tree1bdbaa84005f3945bfb522dd17695a25734b54b5 /doc/ffmpeg-doc.texi
parentde4bc44abb31d79bf2576dbcdb76606d5f7e971d (diff)
Add protocols.texi.
Originally committed as revision 24616 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffmpeg-doc.texi')
-rw-r--r--doc/ffmpeg-doc.texi14
1 files changed, 1 insertions, 13 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index a4330cfaac..ccf06b52de 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -745,19 +745,6 @@ The following constants are available:
@c man end
-@section Protocols
-
-The file name can be @file{-} to read from standard input or to write
-to standard output.
-
-FFmpeg also handles many protocols specified with an URL syntax.
-
-Use 'ffmpeg -protocols' to see a list of the supported protocols.
-
-The protocol @code{http:} is currently used only to communicate with
-FFserver (see the FFserver documentation). When FFmpeg will be a
-video player it will also be used for streaming :-)
-
@chapter Tips
@c man begin TIPS
@@ -966,6 +953,7 @@ file to which you want to add them.
@include indevs.texi
@include outdevs.texi
+@include protocols.texi
@include filters.texi
@ignore