RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748' 

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

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-04 14:06:46 +02:00
parent 1c10e89c51 0ebfdae099
commit 35307df53c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/filters.texi
View File

@ -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.
@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