[FFmpeg-cvslog] Merge commit '18a245a2aea31b92bc435f2962a71e060d83b5f7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 18 09:40:53 2013 +0200| [8ae14bf5ce38469924708ae8f79ec4773b64c9e6] | committer: Michael Niedermayer

Merge commit '18a245a2aea31b92bc435f2962a71e060d83b5f7'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ae14bf5ce38469924708ae8f79ec4773b64c9e6
---