diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 15:04:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 15:04:41 +0100 |
| commit | fc2922836bc289e443c0c7a20450bf8f03c0785d (patch) | |
| tree | 20843987f14580004c6f67314783eb39d00e2e93 /doc | |
| parent | 25be63005f0ba0b4cb8bf2569202ad0e89b4dae3 (diff) | |
| parent | 0b55b16abc15c3fad0ae8b7cedc8f63f1162e89c (diff) | |
| download | ffmpeg-fc2922836bc289e443c0c7a20450bf8f03c0785d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfilter: allow setpts filter to use wallclock time for calculations
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/filters.texi | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index ad8b5daee9..583cc30cb0 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -5466,6 +5466,13 @@ previous output PTS @item PREV_OUTT previous output time in seconds + +@item RTCTIME +wallclock (RTC) time in microseconds + +@item RTCSTART +wallclock (RTC) time at the start of the movie in microseconds + @end table @subsection Examples @@ -5506,6 +5513,12 @@ Apply an offset of 10 seconds to the input PTS: @example setpts=PTS+10/TB @end example + +@item +generate timestamps from a "live source" and rebase onto the current timebase +@example +setpts='(RTCTIME - RTCSTART) / (TB * 1000000)' +@end example @end itemize @section ebur128 |