[FFmpeg-devel] [PATCH] doc/ffmpeg: mention both ffpreset/avpreset in documentation, remove superfluous example

[Michael Niedermayer]

On Fri, Jan 02, 2015 at 11:11:48AM +0100, Werner Robitza wrote:
> ffmpeg looks for both .ffpreset and .avpreset files depending on whether the
> -[avsf]pre or -pre option is used. Added two sections for each type of preset
> including the rules according to which files are searched.
> 
> (Notably, the lookup order is swapped for avpreset files, because it first
> looks for <codec>_<arg>.avpreset and then for <arg>.avpreset.)
> 
> This removes the section explaining -pre only, which was under "Examples",
> where it did not really make sense.
> 
> Signed-off-by: Werner Robitza <werner.robitza at gmail.com>
> ---
>  doc/ffmpeg.texi | 40 ++++++++++++++++++++++++----------------
>  1 file changed, 24 insertions(+), 16 deletions(-)

applied

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Observe your enemies, for they first find out your faults. -- Antisthenes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150105/1f5c0c59/attachment.asc>