Merge commit '6598aaea1ad2cf82d40abb191ac26a5e4e5147ba' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:40:00 +0000 (18:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:40:20 +0000 (18:40 +0200)
commit7b67ce9ade01abcf0d5d08ada62011b43526a646
tree547d9cb282c65b9a7ff4e0abe4422e587a613be5
parent90a1c5e95c3f6bedcb97adb211e6e2b9de17d234
parent6598aaea1ad2cf82d40abb191ac26a5e4e5147ba
Merge commit '6598aaea1ad2cf82d40abb191ac26a5e4e5147ba' into release/2.2

* commit '6598aaea1ad2cf82d40abb191ac26a5e4e5147ba':
  jpeg2000: enable 4 component pixel formats

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