RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-12 18:31:37 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Diego Biurrun 2011-09-29 21:57:29 +02:00
parent 4b7f49082f
commit 25c27f379f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdutils.h
View File

@ -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. * 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 * 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 * 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 is defined, then search for a file named
* codec_name-preset_name.ffpreset in the above-mentioned directories. * codec_name-preset_name.ffpreset in the above-mentioned directories.

4
doc/ffmpeg.texi
View File

@ -806,8 +806,8 @@ preset options identifies the preset file to use according to the
following rules: following rules:
First ffmpeg searches for a file named @var{arg}.ffpreset in the First ffmpeg searches for a file named @var{arg}.ffpreset in the
directories @file{$FFMPEG_DATADIR} (if set), and @file{$HOME/.ffmpeg}, and in directories @file{$AVCONV_DATADIR} (if set), and @file{$HOME/.avconv}, and in
the datadir defined at configuration time (usually @file{PREFIX/share/ffmpeg}) 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 in that order. For example, if the argument is @code{libx264-max}, it will
search for the file @file{libx264-max.ffpreset}. search for the file @file{libx264-max.ffpreset}.