From 60a1ee6e419e244dc2363fdc4ddf8350d506f2ae Mon Sep 17 00:00:00 2001 From: Vicente Jimenez Aguilar Date: Sat, 16 Feb 2013 03:08:36 +0100 Subject: [PATCH] doc: Fix some obsolete references to av* tools as ff* tools Signed-off-by: Diego Biurrun CC: libav-stable@libav.org (cherry picked from commit 202b5f6deb65e405b07b9b5c20f97c8cb925cf49) Signed-off-by: Reinhard Tartler --- doc/bitstream_filters.texi | 2 +- doc/demuxers.texi | 2 +- doc/encoders.texi | 2 +- doc/indevs.texi | 4 ++-- doc/muxers.texi | 2 +- doc/outdevs.texi | 2 +- doc/protocols.texi | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 1fbd40a70c..ba66bc8938 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 c3049ddfc4..af4e3f15cf 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 e1b4dddbc5..b75039515b 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. @@ -277,7 +277,7 @@ input device will use the frame rate value already set in the driver. Video4Linux support is deprecated since Linux 2.6.30, and will be dropped in later versions. -Follow some usage examples of the video4linux devices with the ff* +Follow some usage examples of the video4linux devices with the av* tools. @example # Grab and show the input of a video4linux device, frame rate is set diff --git a/doc/muxers.texi b/doc/muxers.texi index 5a609c8b9a..185d19e262 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 f5bb5324be..1fe2dda994 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. @@ -73,7 +73,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".