[FFmpeg-cvslog] Merge commit '4c205f42c86ccefa093c59434669af34ad14a52b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 17 11:05:18 2013 +0200| [c7078f4907dcff6877cf38f48526788c10644f07] | committer: Michael Niedermayer

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 at gmx.at>

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