Merge commit '7e201d575dc4385eb67314b0419d4d77185e65f4'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:20:36 +0000 (14:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:28:51 +0000 (14:28 +0200)
* commit '7e201d575dc4385eb67314b0419d4d77185e65f4':
  jpeg2000: Validate block lengthinc

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

Simple merge