aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-03-27 23:02:24 +0200
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2011-03-28 22:50:09 +0200
commit681ba7229e8cb0106e7d641be4f6fb0cf6a9fba8 (patch)
tree85d7ba1e5fbf9a93ba4687d8baca67f0c1727415 /doc
parentcdf7cbd6c887f15527bb89245153c9819b7ea87e (diff)
downloadffmpeg-681ba7229e8cb0106e7d641be4f6fb0cf6a9fba8.tar.gz
documentation: sort filter descriptions in filters.texi
Change position of the fade filter description, put it between drawtext and fifo descriptions.
Diffstat (limited to 'doc')
-rw-r--r--doc/filters.texi66
1 files changed, 33 insertions, 33 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index 1b38910145..92b348e10b 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -353,39 +353,6 @@ drawbox
drawbox=10:20:200:60:red@@0.5"
@end example
-@section fade
-
-Apply fade-in/out effect to input video.
-
-It accepts the parameters:
-@var{type}:@var{start_frame}:@var{nb_frames}
-
-@var{type} specifies if the effect type, can be either "in" for
-fade-in, or "out" for a fade-out effect.
-
-@var{start_frame} specifies the number of the start frame for starting
-to apply the fade effect.
-
-@var{nb_frames} specifies the number of frames for which the fade
-effect has to last. At the end of the fade-in effect the output video
-will have the same intensity as the input video, at the end of the
-fade-out transition the output video will be completely black.
-
-A few usage examples follow, usable too as test scenarios.
-@example
-# fade in first 30 frames of video
-fade=in:0:30
-
-# fade out last 45 frames of a 200-frame video
-fade=out:155:45
-
-# fade in first 25 frames and fade out last 25 frames of a 1000-frame video
-fade=in:0:25, fade=out:975:25
-
-# make first 5 frames black, then fade in from frame 5-24
-fade=in:5:20
-@end example
-
@section drawtext
Draw text string or text from specified file on top of video using the
@@ -500,6 +467,39 @@ within the parameter list.
For more information about libfreetype, check:
@url{http://www.freetype.org/}.
+@section fade
+
+Apply fade-in/out effect to input video.
+
+It accepts the parameters:
+@var{type}:@var{start_frame}:@var{nb_frames}
+
+@var{type} specifies if the effect type, can be either "in" for
+fade-in, or "out" for a fade-out effect.
+
+@var{start_frame} specifies the number of the start frame for starting
+to apply the fade effect.
+
+@var{nb_frames} specifies the number of frames for which the fade
+effect has to last. At the end of the fade-in effect the output video
+will have the same intensity as the input video, at the end of the
+fade-out transition the output video will be completely black.
+
+A few usage examples follow, usable too as test scenarios.
+@example
+# fade in first 30 frames of video
+fade=in:0:30
+
+# fade out last 45 frames of a 200-frame video
+fade=out:155:45
+
+# fade in first 25 frames and fade out last 25 frames of a 1000-frame video
+fade=in:0:25, fade=out:975:25
+
+# make first 5 frames black, then fade in from frame 5-24
+fade=in:5:20
+@end example
+
@section fifo
Buffer input images and send them when they are requested.