Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Dec 2012 12:58:12 +0000 (13:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Dec 2012 12:58:12 +0000 (13:58 +0100)
commitb6e7041f90daf89b17a10bcd73cd3b42d4e3540a
treef17b0864e29810a2457a86004b99e8fd3a287009
parent593f5c0f3c559a558efcb10a955cbac499e1fdbb
parentb35e5d985dd12acf9a0aaa52334134edcf35d68e
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>
doc/filters.texi
libavfilter/af_asyncts.c