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