diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 23:48:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 23:49:58 +0200 |
| commit | f42635a50b7af62b120c09e98dbd4a12f4d1e4b5 (patch) | |
| tree | 562ffbe8d57fdb4fdd7b5d9681eea61b55d81e47 /doc/filters.texi | |
| parent | 270d3c96ec492e004275fdb7fd625f801fd1a26b (diff) | |
| parent | 33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff (diff) | |
| download | ffmpeg-f42635a50b7af62b120c09e98dbd4a12f4d1e4b5.tar.gz | |
Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'
* commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff':
vf_setpts: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/f_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index b0d6abc5d8..1c0d82d22a 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6712,8 +6712,17 @@ Change the PTS (presentation timestamp) of the input frames. @code{asetpts} works on audio frames, @code{setpts} on video frames. -Accept in input an expression evaluated through the eval API, which -can contain the following constants: +This filter accepts the following options: + +@table @option + +@item expr +The expression which is evaluated for each frame to construct its timestamp. + +@end table + +The expression is evaluated through the eval API and can contain the following +constants: @table @option @item FRAME_RATE |