aboutsummaryrefslogtreecommitdiffstats
path: root/doc/indevs.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/indevs.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/indevs.texi')
-rw-r--r--doc/indevs.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/indevs.texi b/doc/indevs.texi
index f1d69f73da..1cd2dd63cb 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -1,10 +1,10 @@
@chapter Input Devices
@c man begin INPUT DEVICES
-Input devices are configured elements in Libav which allow to access
+Input devices are configured elements in FFmpeg which allow to access
the data coming from a multimedia device attached to your system.
-When you configure your Libav build, all the supported input devices
+When you configure your FFmpeg build, all the supported input devices
are enabled by default. You can list all available ones using the
configure option "--list-indevs".
@@ -95,7 +95,7 @@ A JACK input device creates one or more JACK writable clients, one for
each audio channel, with name @var{client_name}:input_@var{N}, where
@var{client_name} is the name provided by the application, and @var{N}
is a number which identifies the channel.
-Each writable client will send the acquired data to the Libav input
+Each writable client will send the acquired data to the FFmpeg input
device.
Once you have created one or more JACK readable clients, you need to