[FFmpeg-cvslog] doc: fix references to obsolete presets directories for avconv/ffmpeg

Diego Biurrun git at videolan.org
Wed Oct 12 05:51:15 CEST 2011


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Sep 29 21:57:29 2011 +0200| [25c27f379faaf75479111f451a78ac6da71a6e0c] | committer: Diego Biurrun

doc: fix references to obsolete presets directories for avconv/ffmpeg

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25c27f379faaf75479111f451a78ac6da71a6e0c
---

 cmdutils.h      |    2 +-
 doc/ffmpeg.texi |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmdutils.h b/cmdutils.h
index a20b779..1c17433 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -334,7 +334,7 @@ int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t pts, int64_t dts);
  *
  * If is_path is non-zero, look for the file in the path preset_name.
  * Otherwise search for a file named arg.ffpreset in the directories
- * $FFMPEG_DATADIR (if set), $HOME/.ffmpeg, and in the datadir defined
+ * $AVCONV_DATADIR (if set), $HOME/.avconv, and in the datadir defined
  * at configuration time, in that order. If no such file is found and
  * codec_name is defined, then search for a file named
  * codec_name-preset_name.ffpreset in the above-mentioned directories.
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 2457d65..22989c0 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -806,8 +806,8 @@ 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{$FFMPEG_DATADIR} (if set), and @file{$HOME/.ffmpeg}, and in
-the datadir defined at configuration time (usually @file{PREFIX/share/ffmpeg})
+directories @file{$AVCONV_DATADIR} (if set), and @file{$HOME/.avconv}, and in
+the datadir defined at configuration time (usually @file{PREFIX/share/avconv})
 in that order. For example, if the argument is @code{libx264-max}, it will
 search for the file @file{libx264-max.ffpreset}.
 



More information about the ffmpeg-cvslog mailing list