Merge commit '278a923c51187d37445d88a6b21082036ec9568d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 11:57:59 +0000 (13:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:19:35 +0000 (14:19 +0200)
commitf0358dc1d30cd4f4862489ab95c4d408b00a8b0d
tree3d57ebc7069de651737d83e5d188eb1291484b9f
parent2e85737b0e0bdc9c4d1e28dd9417370f35f8c62d
parent278a923c51187d37445d88a6b21082036ec9568d
Merge commit '278a923c51187d37445d88a6b21082036ec9568d'

* commit '278a923c51187d37445d88a6b21082036ec9568d':
  jpeg2000: Validate SIZ parsing

Conflicts:
libavcodec/jpeg2000dec.c

This commit is not exactly merged due to bugs in it

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