[FFmpeg-cvslog] Merge commit '58b68e4fdea22e22178e237bda950b09cc6f363a'

[Michael Niedermayer]

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

Merge commit '58b68e4fdea22e22178e237bda950b09cc6f363a'

* commit '58b68e4fdea22e22178e237bda950b09cc6f363a':
  proresenc: Report buffer overflow

Conflicts:
	libavcodec/proresenc_kostya.c

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

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