-
Michael Niedermayer authored
* commit '545a0b80': vf_fps: add 'start_time' option Conflicts: doc/filters.texi libavfilter/vf_fps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
b69b075a
* commit '545a0b80': vf_fps: add 'start_time' option Conflicts: doc/filters.texi libavfilter/vf_fps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>