Merge commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 18:20:12 +0000 (20:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 18:21:02 +0000 (20:21 +0200)
* commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b':
  proresenc: Realloc if buffer is too small

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

Simple merge