Merge commit 'fd54dd028bc9f7bfb80ebf823a533dc84b73f936'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:38:37 +0000 (14:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:38:37 +0000 (14:38 +0200)
commita4a16821d7326a6a62c6ac3d9fc8b3d8f111cefc
tree0df0a4ee73ad8a56f5891b89625d1ccf56fa8800
parent2cad1ea29e4df69a556a95e942968184493fb249
parentfd54dd028bc9f7bfb80ebf823a533dc84b73f936
Merge commit 'fd54dd028bc9f7bfb80ebf823a533dc84b73f936'

* commit 'fd54dd028bc9f7bfb80ebf823a533dc84b73f936':
  jpeg2000: check len before parsing header
  jpeg2000: Check component number in get_coc() and get_qcc()

Conflicts:
libavcodec/jpeg2000dec.c

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