Merge commit '5788623d29c3e806a7879210986110aced758dc2'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:25:38 +0000 (13:25 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:25:38 +0000 (13:25 +0200)
commit84d04a0dfa05d170d54585aec8d1ad19cca12410
tree14fadc9b4262303da3dca7202e7c7b4744e3cf70
parent6e611a18390690375a60392061fb6177ef24c7a8
parent5788623d29c3e806a7879210986110aced758dc2
Merge commit '5788623d29c3e806a7879210986110aced758dc2'

* commit '5788623d29c3e806a7879210986110aced758dc2':
  jpeg2000: Split codeblock decoding from the main tile decoding

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