Merge commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:31:40 +0000 (11:31 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:31:40 +0000 (11:31 +0200)
commit5a754f92d1abbbbf1dede3502f7f0c1d1838b98a
treef351c893739702c7112e2e94162d00475082bc19
parent5de28d341f242c6892e4c13d6274100815a5882d
parent41bcc3d15204f290400ba02e4e8f87fc07bcc00e
Merge commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e'

* commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e':
  jpeg2000: Split codeblock decoding from the main tile decoding

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/jpeg2000dec.c