Merge commit '4c205f42c86ccefa093c59434669af34ad14a52b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 09:05:18 +0000 (11:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 09:05:18 +0000 (11:05 +0200)
commitc7078f4907dcff6877cf38f48526788c10644f07
tree2f736c10d8bd2b164e060adbf8335195daa0cb1a
parentd5e5e73c52d3e2e1d853b2d485223d3c7b01da4f
parent4c205f42c86ccefa093c59434669af34ad14a52b
Merge commit '4c205f42c86ccefa093c59434669af34ad14a52b'

* commit '4c205f42c86ccefa093c59434669af34ad14a52b':
  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>
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fps.c