summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2009-01-26 22:23:04 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2009-01-26 22:23:04 +0000
commitbd591ead45b421504c1ebf25ca4ad7899938bb7f (patch)
tree4e7b9e2aa08eeaf99c67f8b2a2ab9b0b247c0c46 /doc
parent822005ed45b994a30cd190312a74f1b144b6cd4a (diff)
Update preset files documentation to match with r16795.
Originally committed as revision 16810 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg-doc.texi8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 499c36f567..bb093f7d6c 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -801,10 +801,10 @@ The argument passed to the preset options identifies the preset file
to use according to the following rules.
First ffmpeg searches for a file named @var{arg}.ffpreset in the
-directories @file{$HOME/.ffmpeg}, @file{/usr/local/share/ffmpeg} and
-@file{/usr/share/ffmpeg} in that order. For example, if the argument
-is @code{libx264-max}, it will search for the file
-@file{libx264-max.ffpreset}.
+directories @file{$HOME/.ffmpeg}, and in the datadir defined at
+configuration time (usually @file{PREFIX/share/ffmpeg}) in that
+order. For example, if the argument is @code{libx264-max}, it will
+search for the file @file{libx264-max.ffpreset}.
If no such file is found, then ffmpeg will search for a file named
@var{codec_name}-@var{arg}.ffpreset in the above-mentioned