Merge commit '44690dfa683f620c77e9f0e8e9bc5682608636b1'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 10:14:04 +0000 (12:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 10:21:15 +0000 (12:21 +0200)
* commit '44690dfa683f620c77e9f0e8e9bc5682608636b1':
  prores: Add a codepath for decoding errors

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

Simple merge