Merge commit '58b68e4fdea22e22178e237bda950b09cc6f363a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 18:11:31 +0000 (20:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 18:11:31 +0000 (20:11 +0200)
* commit '58b68e4fdea22e22178e237bda950b09cc6f363a':
  proresenc: Report buffer overflow

Conflicts:
libavcodec/proresenc_kostya.c

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

Simple merge