Merge commit 'cbc808d726afdf53d866264722785c1304c17390'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Aug 2014 18:27:52 +0000 (20:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Aug 2014 18:29:09 +0000 (20:29 +0200)
* commit 'cbc808d726afdf53d866264722785c1304c17390':
  jpeg2000: enable 4 component pixel formats

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

Trivial merge