diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 13:58:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 13:58:12 +0100 |
| commit | b6e7041f90daf89b17a10bcd73cd3b42d4e3540a (patch) | |
| tree | f17b0864e29810a2457a86004b99e8fd3a287009 /doc/filters.texi | |
| parent | 593f5c0f3c559a558efcb10a955cbac499e1fdbb (diff) | |
| parent | b35e5d985dd12acf9a0aaa52334134edcf35d68e (diff) | |
| download | ffmpeg-b6e7041f90daf89b17a10bcd73cd3b42d4e3540a.tar.gz | |
Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'
* commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e':
doc: improve documentation for the asyncts filter first_pts option
asyncts: fix the asyncts behavior when using the first_pts option
Conflicts:
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 76c694b35b..7b2c56cd33 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -782,11 +782,12 @@ Maximum compensation in samples per second. Relevant only with compensate=1. Default value 500. @item first_pts -Assume the first pts should be this value. +Assume the first pts should be this value. The time base is 1 / sample rate. 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 -silence if an audio stream starts after the video stream. +silence if an audio stream starts after the video stream or to trim any samples +with a negative pts due to encoder delay. @end table |