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)
* commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e':
  jpeg2000: Split codeblock decoding from the main tile decoding

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

Simple merge