[FFmpeg-cvslog] doc/filters: extend fps documentation.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Tue Dec 11 18:11:25 2012 +0100| [b2f2321cecf3a52b5b0c6408950de0e86ae8d625] | committer: Clément Bœsch

doc/filters: extend fps documentation.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2f2321cecf3a52b5b0c6408950de0e86ae8d625
---

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

diff --git a/doc/filters.texi b/doc/filters.texi
index 8d4f5ca..1f36b3a 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -2408,13 +2408,33 @@ This filter accepts the following named parameters:
 @table @option
 
 @item fps
-Desired output framerate.
+Desired output framerate. The default is @code{25}.
 
 @item round
-Rounding method. The default is @code{near}.
+Rounding method.
+
+Possible values are:
+ at table @option
+ at item zero
+zero round towards 0
+ at item inf
+round away from 0
+ at item down
+round towards -infinity
+ at item up
+round towards +infinity
+ at item near
+round to nearest
+ at end table
+The default is @code{near}.
 
 @end table
 
+Alternatively, the options can be specified as a flat string:
+ at var{fps}[:@var{round}].
+
+See also the @ref{setpts} filter.
+
 @section framestep
 
 Select one frame every N.
@@ -4867,6 +4887,7 @@ sendcmd=f=test.cmd,drawtext=fontfile=FreeSerif.ttf:text='',hue
 @end example
 @end itemize
 
+ at anchor{setpts}
 @section asetpts, setpts
 
 Change the PTS (presentation timestamp) of the input frames.