aboutsummaryrefslogtreecommitdiffstats
path: root/doc/protocols.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-03-17 16:55:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-03-17 17:26:45 +0100
commita6be21d3baf09be1e22648e4802b955191d26b67 (patch)
tree6762797c6fa93501e2a275340aa8739f0c32e7c6 /doc/protocols.texi
parent0fecf2642b9d909820683647c70031a954f5e58d (diff)
downloadffmpeg-a6be21d3baf09be1e22648e4802b955191d26b67.tar.gz
Revert "replace FFmpeg with Libav in doc/"
This reverts commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4. Conflicts: doc/optimization.txt
Diffstat (limited to 'doc/protocols.texi')
-rw-r--r--doc/protocols.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index a17d66362a..29950eb8cd 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -1,10 +1,10 @@
@chapter Protocols
@c man begin PROTOCOLS
-Protocols are configured elements in Libav which allow to access
+Protocols are configured elements in FFmpeg which allow to access
resources which require the use of a particular protocol.
-When you configure your Libav build, all the supported protocols are
+When you configure your FFmpeg build, all the supported protocols are
enabled by default. You can list all available ones using the
configure option "--list-protocols".