[FFmpeg-cvslog] r20435 - trunk/ffmpeg.c

[Ramiro Polla]

On Thu, Dec 3, 2009 at 6:04 AM, Stefano Sabatini
<stefano.sabatini-lala at poste.it> wrote:
> On date Wednesday 2009-12-02 23:14:51 -0200, Ramiro Polla wrote:
> [...]
>> New patch attached with your suggestions, and a ':' on "according to
>> the following rules:"
>>
>> Ramiro Polla
>
>> Index: doc/ffmpeg-doc.texi
>> ===================================================================
>> --- doc/ffmpeg-doc.texi ? ? ? (revision 20711)
>> +++ doc/ffmpeg-doc.texi ? ? ? (working copy)
>> @@ -833,13 +833,17 @@
>> ?('#') 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
>> - at code{spre} options. The options specified in a preset file are
>> +Preset files are specified with the @code{vpre}, @code{apre},
>> + at code{spre}, and @code{fpre} options. The @code{fpre} option takes as
>> +input the filename of the preset instead of a preset name and can be
>> +used for any kind of codec. For the @code{vpre}, @code{apre}, and
>> + at 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 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
>>
>
> Thanks, fine for me.

Diego ping?