-
Michael Niedermayer authored
* commit '4c205f42': vf_drawbox: make config_props work properly when called multiple times. vf_drawtext: do not reset the frame number in config_input. vf_fps: move initializing pts from config_props to init. Conflicts: libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
c7078f49