[FFmpeg-cvslog] [FFmpeg/FFmpeg] beedeb: doc/ffmpeg: mention both ffpreset/avpreset in docu...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/FFmpeg/FFmpeg
  Commit: beedeb4399fe5f6d3a9c9fcc4f0d5e856bfd7581
      https://github.com/FFmpeg/FFmpeg/commit/beedeb4399fe5f6d3a9c9fcc4f0d5e856bfd7581
  Author: Werner Robitza <werner.robitza at gmail.com>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M doc/ffmpeg.texi

  Log Message:
  -----------
  doc/ffmpeg: mention both ffpreset/avpreset in documentation, remove superfluous example

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>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>