* commit '9b2c57be':
  drawtext: Add an alpha option

Conflicts:
	doc/filters.texi
	libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>