aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg-doc.texi
diff options
context:
space:
mode:
authorRobert Krüger <krueger@signal7.de>2010-04-20 17:37:06 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2010-04-20 17:37:06 +0000
commit2328e5a289b1ab162450ae0a2c17619cd032aa05 (patch)
tree346821024593bfb81f5682337c16907e82bb6335 /doc/ffmpeg-doc.texi
parentbf29cbc2cc771e544174f87c5563f85a060f93b9 (diff)
downloadffmpeg-2328e5a289b1ab162450ae0a2c17619cd032aa05.tar.gz
Allow setting the environment variable FFMPEG_DATADIR to locate preset files.
Patch by Robert Krüger <krueger signal7 de>. Originally committed as revision 22923 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffmpeg-doc.texi')
-rw-r--r--doc/ffmpeg-doc.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 2736249de5..7be11d244e 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -806,9 +806,9 @@ 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}, 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
+directories @file{$FFMPEG_DATADIR} (if set), and @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