diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 13:37:10 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 13:37:10 +0400 |
| commit | b69b075ac607419a840da798b089de8ea7630d4b (patch) | |
| tree | 8f3476fc1f20bc3d81813b18a0d4ea4bdfe3cb82 /doc/filters.texi | |
| parent | 58e12732dbab77fe06b861dcbdc712c5fa065bbd (diff) | |
| parent | 545a0b807cf45b2bbc4c9087a297b741ce00f508 (diff) | |
Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508'
* commit '545a0b807cf45b2bbc4c9087a297b741ce00f508':
vf_fps: add 'start_time' option
Conflicts:
doc/filters.texi
libavfilter/vf_fps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 0dc928889d..6bc07718b0 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -4166,6 +4166,14 @@ Alternatively, the options can be specified as a flat string: See also the @ref{setpts} filter. +@item start_time +Assume the first PTS should be the given value, in seconds. This allows for +padding/trimming at the start of stream. By default, no assumption is made +about the first frame's expected PTS, so no padding or trimming is done. +For example, this could be set to 0 to pad the beginning with duplicates of +the first frame if a video stream starts after the audio stream or to trim any +frames with a negative PTS. + @subsection Examples @itemize |