[SCM] libav/experimental: Move settb docs after setpts docs, fix alphabetical order.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:18:33 UTC 2013


The following commit has been merged in the experimental branch:
commit d89e3b36e3902da41edbbc5240499d0c41ec46c9
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Tue Nov 2 22:40:31 2010 +0000

    Move settb docs after setpts docs, fix alphabetical order.
    
    Originally committed as revision 25656 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/filters.texi b/doc/filters.texi
index e090a04..4750d32 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -472,36 +472,6 @@ ratio of the input image.
 
 The default value of @var{width} and @var{height} is 0.
 
- at section settb
-
-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 "PI", "E", "PHI", "AVTB" (the
-default timebase), and "intb" (the input timebase).
-
-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 setpts
 
 Change the PTS (presentation timestamp) of the input video frames.
@@ -562,6 +532,36 @@ setpts=N/(25*TB)
 setpts='1/(25*TB) * (N + 0.05 * sin(N*2*PI/25))'
 @end example
 
+ at section settb
+
+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 "PI", "E", "PHI", "AVTB" (the
+default timebase), and "intb" (the input timebase).
+
+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 slicify
 
 Pass the images of input video on to next video filter as multiple

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list