Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 09:37:10 +0000 (11:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 09:37:10 +0000 (11:37 +0200)
commitb69b075ac607419a840da798b089de8ea7630d4b
tree8f3476fc1f20bc3d81813b18a0d4ea4bdfe3cb82
parent58e12732dbab77fe06b861dcbdc712c5fa065bbd
parent545a0b807cf45b2bbc4c9087a297b741ce00f508
Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi
libavfilter/vf_fps.c