* commit '03927cb7':
  psymodel: Check memory allocation

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