[FFmpeg-cvslog] Merge commit '42df71d9bbb1a5b4bce0bb34417692565c72d390'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 02:26:03 2015 +0200| [abee1972ef8a88fde0bff5f40f4767cb3150d26e] | committer: Michael Niedermayer

Merge commit '42df71d9bbb1a5b4bce0bb34417692565c72d390'

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

Conflicts:
	libavcodec/ratecontrol.c

See: 0898a6d4e4b669704fce663f610aa43dd7483fe9
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=abee1972ef8a88fde0bff5f40f4767cb3150d26e
---