generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-12-14 13:58:12 +01:00
parent 593f5c0f3c b35e5d985d
commit b6e7041f90
2 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/filters.texi
View File

@@ -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