[FFmpeg-cvslog] Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 14 13:58:12 2012 +0100| [b6e7041f90daf89b17a10bcd73cd3b42d4e3540a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6e7041f90daf89b17a10bcd73cd3b42d4e3540a
---