aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg.texi
diff options
context:
space:
mode:
authorJanne Grunau <janne-ffmpeg@jannau.net>2011-03-14 22:59:19 +0100
committerJanne Grunau <janne-libav@jannau.net>2011-03-16 22:01:01 +0100
commitf8a45fa1b1764b34d4263eacd93411e8ba0484a4 (patch)
treea5d27f5c5f38dd6fc28ce2f40b2748b09bd6a5dd /doc/ffmpeg.texi
parenta03be6e1ba4cbf9984b0bbdb674704bbb2da6713 (diff)
downloadffmpeg-f8a45fa1b1764b34d4263eacd93411e8ba0484a4.tar.gz
replace FFmpeg with Libav in doc/
unless it stands for ffmpeg the program or is historic
Diffstat (limited to 'doc/ffmpeg.texi')
-rw-r--r--doc/ffmpeg.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index f0f3b65084..bc30ba3d75 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -735,7 +735,7 @@ A preset file contains a sequence of @var{option}=@var{value} pairs,
one for each line, specifying a sequence of options which would be
awkward to specify on the command line. Lines starting with the hash
('#') character are ignored and are used to provide comments. Check
-the @file{ffpresets} directory in the FFmpeg source tree for examples.
+the @file{ffpresets} directory in the Libav source tree for examples.
Preset files are specified with the @code{vpre}, @code{apre},
@code{spre}, and @code{fpre} options. The @code{fpre} option takes the
@@ -997,11 +997,11 @@ file to which you want to add them.
@settitle FFmpeg video converter
@c man begin SEEALSO
-ffplay(1), ffprobe(1), ffserver(1) and the FFmpeg HTML documentation
+ffplay(1), ffprobe(1), ffserver(1) and the Libav HTML documentation
@c man end
@c man begin AUTHORS
-The FFmpeg developers
+The Libav developers
@c man end
@end ignore