diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 14:06:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 14:06:46 +0200 |
| commit | 35307df53c578444decc8cfc02b376743fabea9c (patch) | |
| tree | 67d57c94e23761cbac48722f0bd42c5d833e143b /doc | |
| parent | 1c10e89c5155fbd13fbf3c0da890a373145f1c32 (diff) | |
| parent | 0ebfdae099d2749240b6a565abcdf0bf62589748 (diff) | |
| download | ffmpeg-35307df53c578444decc8cfc02b376743fabea9c.tar.gz | |
Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748'
* commit '0ebfdae099d2749240b6a565abcdf0bf62589748':
doc: Describe TB option of setpts filter
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/filters.texi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index f59d23a78e..8f1446da0a 100644 --- 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 |