* commit '522d971c':
  xsub: Check memory allocation

Conflicts:
	libavcodec/xsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>