diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2009-12-06 17:02:12 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2009-12-06 17:02:12 +0000 |
| commit | 35c504b6fed9043f100bd2480adef7dd5f370971 (patch) | |
| tree | e310954115fff727e77fbd51ecb6499574ac7882 /doc/ffmpeg-doc.texi | |
| parent | 08f19605883b0379f5e0ed025dd7e7b7d8efc420 (diff) | |
| download | ffmpeg-35c504b6fed9043f100bd2480adef7dd5f370971.tar.gz | |
Update documentation for r20435 (which added the -fpre option).
Originally committed as revision 20753 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffmpeg-doc.texi')
| -rw-r--r-- | doc/ffmpeg-doc.texi | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi index 98c710a8ec..d6116167f3 100644 --- a/doc/ffmpeg-doc.texi +++ b/doc/ffmpeg-doc.texi @@ -833,13 +833,17 @@ awkward to specify on the command line. Lines starting with the hash ('#') character are ignored and are used to provide comments. Check the @file{ffpresets} directory in the FFmpeg source tree for examples. -Preset files are specified with the @code{vpre}, @code{apre} and -@code{spre} options. The options specified in a preset file are +Preset files are specified with the @code{vpre}, @code{apre}, +@code{spre}, and @code{fpre} options. The @code{fpre} option takes the +filename of the preset instead of a preset name as input and can be +used for any kind of codec. For the @code{vpre}, @code{apre}, and +@code{spre} options, the options specified in a preset file are applied to the currently selected codec of the same type as the preset option. -The argument passed to the preset options identifies the preset file -to use according to the following rules. +The argument passed to the @code{vpre}, @code{apre}, and @code{spre} +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 @@ -854,11 +858,6 @@ the preset file options will be applied. For example, if you select the video codec with @code{-vcodec libx264} and use @code{-vpre max}, then it will search for the file @file{libx264-max.ffpreset}. -Finally, if the above rules failed and the argument specifies an -absolute pathname, ffmpeg will search for that filename. This way you -can specify the absolute and complete filename of the preset file, for -example @file{./ffpresets/libx264-max.ffpreset}. - @anchor{FFmpeg formula evaluator} @section FFmpeg formula evaluator |