[FFmpeg-cvslog] Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 21 11:37:10 2013 +0200| [b69b075ac607419a840da798b089de8ea7630d4b] | committer: Michael Niedermayer

Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508'

* commit '545a0b807cf45b2bbc4c9087a297b741ce00f508':
  vf_fps: add 'start_time' option

Conflicts:
	doc/filters.texi
	libavfilter/vf_fps.c

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

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