* commit '42df71d9':
  ratecontrol: Check memory allocation

Conflicts:
	libavcodec/ratecontrol.c

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