Merge commit 'a437298de55c6a6a4f06b12335b3891bf4459082' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Aug 2014 00:58:21 +0000 (02:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Aug 2014 00:58:21 +0000 (02:58 +0200)
commitbb1d75e6c5e3ff0f4c4b7e53e4f9aacc25a110f4
tree5b19e51a10ae9c627662f1b5594c584a27470e2a
parent459a84ada3b7e0bac3a0ea7360e83cc87f625d31
parenta437298de55c6a6a4f06b12335b3891bf4459082
Merge commit 'a437298de55c6a6a4f06b12335b3891bf4459082' into release/2.2

* commit 'a437298de55c6a6a4f06b12335b3891bf4459082':
  proresenc: Realloc if buffer is too small

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