Commit 5e3b5723 authored by ramiro's avatar ramiro

Update documentation for r20435 (which added the -fpre option).

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20753 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent efb46281
...@@ -833,13 +833,17 @@ awkward to specify on the command line. Lines starting with the hash ...@@ -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 ('#') character are ignored and are used to provide comments. Check
the @file{ffpresets} directory in the FFmpeg source tree for examples. the @file{ffpresets} directory in the FFmpeg source tree for examples.
Preset files are specified with the @code{vpre}, @code{apre} and Preset files are specified with the @code{vpre}, @code{apre},
@code{spre} options. The options specified in a preset file are @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 applied to the currently selected codec of the same type as the preset
option. option.
The argument passed to the preset options identifies the preset file The argument passed to the @code{vpre}, @code{apre}, and @code{spre}
to use according to the following rules. 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 First ffmpeg searches for a file named @var{arg}.ffpreset in the
directories @file{$HOME/.ffmpeg}, and in the datadir defined at 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 ...@@ -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}, the video codec with @code{-vcodec libx264} and use @code{-vpre max},
then it will search for the file @file{libx264-max.ffpreset}. 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} @anchor{FFmpeg formula evaluator}
@section FFmpeg formula evaluator @section FFmpeg formula evaluator
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment