[FFmpeg-cvslog] Merge commit 'a437298de55c6a6a4f06b12335b3891bf4459082' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 23 02:58:21 2014 +0200| [bb1d75e6c5e3ff0f4c4b7e53e4f9aacc25a110f4] | committer: Michael Niedermayer

Merge commit 'a437298de55c6a6a4f06b12335b3891bf4459082' into release/2.2

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

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

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