Merge commit '42df71d9bbb1a5b4bce0bb34417692565c72d390'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:26:03 +0000 (02:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:27:26 +0000 (02:27 +0200)
commitabee1972ef8a88fde0bff5f40f4767cb3150d26e
treed687cb497295227bc6c86abc0c879ee97f0d9fac
parent6ed8341cb163e4c253449458aa21a0b3aab1e2b6
parent42df71d9bbb1a5b4bce0bb34417692565c72d390
Merge commit '42df71d9bbb1a5b4bce0bb34417692565c72d390'

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

Conflicts:
libavcodec/ratecontrol.c

See: 0898a6d4e4b669704fce663f610aa43dd7483fe9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ratecontrol.c