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)
commitdb5c93a1a97d3b6919d70bce65d09dc53be708f8
tree94abc042764c7a8ecc6c0586bb282b4f45f77a09
parentf0358dc1d30cd4f4862489ab95c4d408b00a8b0d
parent7e201d575dc4385eb67314b0419d4d77185e65f4
Merge commit '7e201d575dc4385eb67314b0419d4d77185e65f4'

* commit '7e201d575dc4385eb67314b0419d4d77185e65f4':
  jpeg2000: Validate block lengthinc

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