Merge commit '18a245a2aea31b92bc435f2962a71e060d83b5f7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 07:40:53 +0000 (09:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 08:03:35 +0000 (10:03 +0200)
* commit '18a245a2aea31b92bc435f2962a71e060d83b5f7':
  jpeg2000dec: Add more checks when parsing headers

The check cannot be true in FFmpeg, but does no harm.
I will move it in a subsequent commit so it can detect missing SIZ

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

Simple merge