[FFmpeg-cvslog] Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  4 14:06:46 2013 +0200| [35307df53c578444decc8cfc02b376743fabea9c] | committer: Michael Niedermayer

Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748'

* commit '0ebfdae099d2749240b6a565abcdf0bf62589748':
  doc: Describe TB option of setpts filter

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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