[FFmpeg-cvslog] doc/filters: move *setpts and *settb filters to the multimedia filters section

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Aug 23 11:48:23 2012 +0200| [0043db29676fee12290e70e0097810292d3bc40c] | committer: Stefano Sabatini

doc/filters: move *setpts and *settb filters to the multimedia filters section

Since audio and video filters are explained together and share most code,
the multimedia filters section seems more fitting.

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

 doc/filters.texi |  200 +++++++++++++++++++++++++++---------------------------
 1 file changed, 100 insertions(+), 100 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 6e7646f..534526c 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3179,106 +3179,6 @@ Mark the frame as top-field-first.
 Mark the frame as progressive.
 @end table
 
- at section asetpts, setpts
-
-Change the PTS (presentation timestamp) of the input frames.
-
- at code{asetpts} works on audio frames, @code{setpts} on video frames.
-
-Accept in input an expression evaluated through the eval API, which
-can contain the following constants:
-
- at table @option
- at item PTS
-the presentation timestamp in input
-
- at item N
-the count of the input frame, starting from 0.
-
- at item NB_CONSUMED_SAMPLES
-the number of consumed samples, not including the current frame (only
-audio)
-
- at item NB_SAMPLES
-the number of samples in the current frame (only audio)
-
- at item SAMPLE_RATE
-audio sample rate
-
- at item STARTPTS
-the PTS of the first video frame
-
- at item INTERLACED
-tell if the current frame is interlaced
-
- at item TB
-the time base
-
- at item POS
-original position in the file of the frame, or undefined if undefined
-for the current frame
-
- at item PREV_INPTS
-previous input PTS
-
- at item PREV_OUTPTS
-previous output PTS
-
- at end table
-
-Some examples follow:
-
- at example
-# start counting PTS from zero
-setpts=PTS-STARTPTS
-
-# fast motion
-setpts=0.5*PTS
-
-# slow motion
-setpts=2.0*PTS
-
-# fixed rate 25 fps
-setpts=N/(25*TB)
-
-# fixed rate 25 fps with some jitter
-setpts='1/(25*TB) * (N + 0.05 * sin(N*2*PI/25))'
-
-# apply an offset of 10 seconds to the input PTS
-setpts=PTS+10/TB
- at end example
-
- at section settb, asettb
-
-Set the timebase to use for the output frames timestamps.
-It is mainly useful for testing timebase configuration.
-
-It accepts in input an arithmetic expression representing a rational.
-The expression can contain the constants "AVTB" (the
-default timebase), "intb" (the input timebase) and "sr" (the sample rate,
-audio only).
-
-The default value for the input is "intb".
-
-Follow some examples.
-
- at example
-# set the timebase to 1/25
-settb=1/25
-
-# set the timebase to 1/10
-settb=0.1
-
-#set the timebase to 1001/1000
-settb=1+0.001
-
-#set the timebase to 2*intb
-settb=2*intb
-
-#set the default timebase value
-settb=AVTB
- at end example
-
 @section showinfo
 
 Show a line containing various information for each input video frame.
@@ -4200,6 +4100,106 @@ tools.
 
 Below is a description of the currently available multimedia filters.
 
+ at section asetpts, setpts
+
+Change the PTS (presentation timestamp) of the input frames.
+
+ at code{asetpts} works on audio frames, @code{setpts} on video frames.
+
+Accept in input an expression evaluated through the eval API, which
+can contain the following constants:
+
+ at table @option
+ at item PTS
+the presentation timestamp in input
+
+ at item N
+the count of the input frame, starting from 0.
+
+ at item NB_CONSUMED_SAMPLES
+the number of consumed samples, not including the current frame (only
+audio)
+
+ at item NB_SAMPLES
+the number of samples in the current frame (only audio)
+
+ at item SAMPLE_RATE
+audio sample rate
+
+ at item STARTPTS
+the PTS of the first frame
+
+ at item INTERLACED
+tell if the current frame is interlaced
+
+ at item TB
+the time base
+
+ at item POS
+original position in the file of the frame, or undefined if undefined
+for the current frame
+
+ at item PREV_INPTS
+previous input PTS
+
+ at item PREV_OUTPTS
+previous output PTS
+
+ at end table
+
+Some examples follow:
+
+ at example
+# start counting PTS from zero
+setpts=PTS-STARTPTS
+
+# fast motion
+setpts=0.5*PTS
+
+# slow motion
+setpts=2.0*PTS
+
+# fixed rate 25 fps
+setpts=N/(25*TB)
+
+# fixed rate 25 fps with some jitter
+setpts='1/(25*TB) * (N + 0.05 * sin(N*2*PI/25))'
+
+# apply an offset of 10 seconds to the input PTS
+setpts=PTS+10/TB
+ at end example
+
+ at section settb, asettb
+
+Set the timebase to use for the output frames timestamps.
+It is mainly useful for testing timebase configuration.
+
+It accepts in input an arithmetic expression representing a rational.
+The expression can contain the constants "AVTB" (the
+default timebase), "intb" (the input timebase) and "sr" (the sample rate,
+audio only).
+
+The default value for the input is "intb".
+
+Follow some examples.
+
+ at example
+# set the timebase to 1/25
+settb=1/25
+
+# set the timebase to 1/10
+settb=0.1
+
+#set the timebase to 1001/1000
+settb=1+0.001
+
+#set the timebase to 2*intb
+settb=2*intb
+
+#set the default timebase value
+settb=AVTB
+ at end example
+
 @section concat
 
 Concatenate audio and video streams, joining them together one after the