Commit 35307df5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '0ebfdae0'

* commit '0ebfdae0':
  doc: Describe TB option of setpts filter

Conflicts:
	doc/filters.texi
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1c10e89c 0ebfdae0
...@@ -9176,9 +9176,6 @@ tell if the current frame is interlaced ...@@ -9176,9 +9176,6 @@ tell if the current frame is interlaced
@item T @item T
the time in seconds of the current frame the time in seconds of the current frame
@item TB
the time base
@item POS @item POS
original position in the file of the frame, or undefined if undefined original position in the file of the frame, or undefined if undefined
for the current frame for the current frame
...@@ -9201,6 +9198,10 @@ instead. ...@@ -9201,6 +9198,10 @@ instead.
@item RTCSTART @item RTCSTART
wallclock (RTC) time at the start of the movie in microseconds wallclock (RTC) time at the start of the movie in microseconds
@item TB
timebase of the input timestamps
@end table @end table
@subsection Examples @subsection Examples
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment