Merge commit '6598aaea1ad2cf82d40abb191ac26a5e4e5147ba' into release/2.2
* commit '6598aaea1ad2cf82d40abb191ac26a5e4e5147ba':
jpeg2000: enable 4 component pixel formats
See: f0358dc1d3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in: