Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748'

* commit '0ebfdae099d2749240b6a565abcdf0bf62589748': doc: Describe TB option of setpts filter Conflicts: doc/filters.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 35307df53c
parent 1c10e89c51 0ebfdae099
commit 35307df53c
1 changed files with 4 additions and 3 deletions
--- a/doc/filters.texi
+++ b/doc/filters.texi
@ -9176,9 +9176,6 @@ tell if the current frame is interlaced
@item T
 the time in seconds of the current frame

-@item TB
-the time base
-
@item POS
 original position in the file of the frame, or undefined if undefined
 for the current frame
@ -9201,6 +9198,10 @@ instead.

@item RTCSTART
 wallclock (RTC) time at the start of the movie in microseconds
+
+@item TB
+timebase of the input timestamps
+
@end table

@subsection Examples