diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-09-29 21:57:29 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-10-11 14:31:19 +0200 |
| commit | 25c27f379faaf75479111f451a78ac6da71a6e0c (patch) | |
| tree | 237d32f7b39e54e59281e416a2ff30def97c2a71 | |
| parent | 4b7f49082f80cf92475c999f8c42e112a13aed6a (diff) | |
doc: fix references to obsolete presets directories for avconv/ffmpeg
| -rw-r--r-- | cmdutils.h | 2 | ||||
| -rw-r--r-- | doc/ffmpeg.texi | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmdutils.h b/cmdutils.h index a20b779f1a..1c17433bc5 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 2457d65253..22989c0723 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}. |