[FFmpeg-cvslog] Merge commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 18 20:20:12 2014 +0200| [e348a81a66851e35b9f6facf70c678e886bd3805] | committer: Michael Niedermayer

Merge commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b'

* commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b':
  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=e348a81a66851e35b9f6facf70c678e886bd3805
---