Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748'

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

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/35/head
Michael Niedermayer 12 years ago
parent 1c10e89c51 0ebfdae099
commit 35307df53c
1 changed files with 4 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      doc/filters.texi

7
doc/filters.texi
Unescape 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

Write Preview
Loading…
Cancel
Save