aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVicente Jimenez Aguilar <googuy@gmail.com>2013-02-16 03:08:36 +0100
committerReinhard Tartler <siretart@tauware.de>2013-02-19 08:11:11 +0100
commit6626a7df534591c1eaed860bcb2f61610a3727f4 (patch)
treeda6547e56a3d29b68e6be9aab932e0e49caabb7f
parentab434bf0d051008a329d49d0256faa5d64e2bf4d (diff)
downloadffmpeg-6626a7df534591c1eaed860bcb2f61610a3727f4.tar.gz
doc: Fix some obsolete references to av* tools as ff* tools
Signed-off-by: Diego Biurrun <diego@biurrun.de> CC: libav-stable@libav.org (cherry picked from commit 202b5f6deb65e405b07b9b5c20f97c8cb925cf49) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r--doc/bitstream_filters.texi2
-rw-r--r--doc/demuxers.texi2
-rw-r--r--doc/encoders.texi2
-rw-r--r--doc/indevs.texi2
-rw-r--r--doc/muxers.texi2
-rw-r--r--doc/outdevs.texi2
-rw-r--r--doc/protocols.texi4
7 files changed, 8 insertions, 8 deletions
diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi
index a6fe2f2633..6e7f8781ee 100644
--- a/doc/bitstream_filters.texi
+++ b/doc/bitstream_filters.texi
@@ -10,7 +10,7 @@ You can disable all the bitstream filters using the configure option
the option @code{--enable-bsf=BSF}, or you can disable a particular
bitstream filter using the option @code{--disable-bsf=BSF}.
-The option @code{-bsfs} of the ff* tools will display the list of
+The option @code{-bsfs} of the av* tools will display the list of
all the supported bitstream filters included in your build.
Below is a description of the currently available bitstream filters.
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 2d5c425922..b78cf680ef 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -13,7 +13,7 @@ You can disable all the demuxers using the configure option
the option "--enable-demuxer=@var{DEMUXER}", or disable it
with the option "--disable-demuxer=@var{DEMUXER}".
-The option "-formats" of the ff* tools will display the list of
+The option "-formats" of the av* tools will display the list of
enabled demuxers.
The description of some of the currently available demuxers follows.
diff --git a/doc/encoders.texi b/doc/encoders.texi
index 830981fe8d..0491d7314a 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -14,7 +14,7 @@ You can disable all the encoders with the configure option
with the options @code{--enable-encoder=@var{ENCODER}} /
@code{--disable-encoder=@var{ENCODER}}.
-The option @code{-codecs} of the ff* tools will display the list of
+The option @code{-codecs} of the av* tools will display the list of
enabled encoders.
@c man end ENCODERS
diff --git a/doc/indevs.texi b/doc/indevs.texi
index 868329799f..8ff64a78ed 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -13,7 +13,7 @@ You can disable all the input devices using the configure option
option "--enable-indev=@var{INDEV}", or you can disable a particular
input device using the option "--disable-indev=@var{INDEV}".
-The option "-formats" of the ff* tools will display the list of
+The option "-formats" of the av* tools will display the list of
supported input devices (amongst the demuxers).
A description of the currently available input devices follows.
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 4973f1af1d..d183eaf1bd 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -13,7 +13,7 @@ You can disable all the muxers with the configure option
with the options @code{--enable-muxer=@var{MUXER}} /
@code{--disable-muxer=@var{MUXER}}.
-The option @code{-formats} of the ff* tools will display the list of
+The option @code{-formats} of the av* tools will display the list of
enabled muxers.
A description of some of the currently available muxers follows.
diff --git a/doc/outdevs.texi b/doc/outdevs.texi
index 938909c784..dd7bd6475d 100644
--- a/doc/outdevs.texi
+++ b/doc/outdevs.texi
@@ -13,7 +13,7 @@ You can disable all the output devices using the configure option
option "--enable-outdev=@var{OUTDEV}", or you can disable a particular
input device using the option "--disable-outdev=@var{OUTDEV}".
-The option "-formats" of the ff* tools will display the list of
+The option "-formats" of the av* tools will display the list of
enabled output devices (amongst the muxers).
A description of the currently available output devices follows.
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 086a249a13..0d40e5eeb9 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -14,7 +14,7 @@ option "--enable-protocol=@var{PROTOCOL}", or you can disable a
particular protocol using the option
"--disable-protocol=@var{PROTOCOL}".
-The option "-protocols" of the ff* tools will display the list of
+The option "-protocols" of the av* tools will display the list of
supported protocols.
A description of the currently available protocols follows.
@@ -57,7 +57,7 @@ use the command:
avconv -i file:input.mpeg output.mpeg
@end example
-The ff* tools default to the file protocol, that is a resource
+The av* tools default to the file protocol, that is a resource
specified with the name "FILE.mpeg" is interpreted as the URL
"file:FILE.mpeg".