* commit '5a1addd7':
  xsub: Support DXSA subtitles

Conflicts:
	libavcodec/xsubdec.c

See: d6f910eaMerged-by: Michael Niedermayer <michaelni@gmx.at>