[FFmpeg-cvslog] Merge commit '57bc64e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  3 13:00:57 2013 +0200| [7c71ef4f1727e6a59b7266ef04be1076b6363b61] | committer: Michael Niedermayer

Merge commit '57bc64e'

* commit '57bc64e':
  jpeg2000: Use bytestream2
  jpeg2000: Clean up return paths and error messages
  jpeg2000: Define the maximum decomposition levels
  jpeg2000: Check code-block size

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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