[FFmpeg-cvslog] Merge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 18:27:40 2013 +0200| [d70b4944223831c17a37680bbd9d3caca1c32659] | committer: Michael Niedermayer

Merge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a'

* commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a':
  vf_drawtext: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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