[FFmpeg-devel] [PATCH 5/7] doc/filters: complete tile documentation.

[Clément Bœsch]

---
 doc/filters.texi | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index eaf0f42..d03b9ac 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3665,8 +3665,31 @@ ffmpeg -i in.avi -vf thumbnail,scale=300:200 -frames:v 1 out.png
 
 Tile several successive frames together.
 
-It accepts as argument the tile size (i.e. the number of lines and columns)
-in the form "@var{w}x at var{h}".
+It accepts a list of options in the form of @var{key}=@var{value} pairs
+separated by ":". A description of the accepted options follows.
+
+ at table @option
+
+ at item s, size
+Set the tile size (i.e. the number of lines and columns) in the form
+"@var{w}x at var{h}".
+
+ at item margin
+Set the outer border margin in pixels.
+
+ at item padding
+Set the inner border thickness (i.e. the number of pixels between frames).
+
+ at item nb_frames
+Set the maximum number of frames to render in the given area. It must be
+inferior or equal to @var{w}x at var{h}. The default value is @code{0}, meaning
+all the area will be used.
+
+ at end table
+
+Alternatively, the options can be specified as a flat string:
+
+ at var{size}[:@var{nb_frames}[:@var{margin}[:@var{padding}]]]
 
 For example, produce 8×8 PNG tiles of all keyframes (@option{-skip_frame
 nokey}) in a movie:
@@ -3677,6 +3700,13 @@ The @option{-vsync 0} is necessary to prevent @command{ffmpeg} from
 duplicating each output frame to accomodate the originally detected frame
 rate.
 
+Another example to display @code{5} pictures in an area of @code{3x2} frames,
+with @code{7} pixels between them, and @code{2} pixels of initial margin, using
+mixed flat and named options:
+ at example
+tile=3x2:nb_frames=5:padding=7:margin=2
+ at end example
+
 @section tinterlace
 
 Perform various types of temporal field interlacing.
-- 
1.8.0