[FFmpeg-cvslog] Merge commit 'cbc808d726afdf53d866264722785c1304c17390'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug  6 20:27:52 2014 +0200| [5836fe20c686fa9fe6a85afe306485b312ad1698] | committer: Michael Niedermayer

Merge commit 'cbc808d726afdf53d866264722785c1304c17390'

* commit 'cbc808d726afdf53d866264722785c1304c17390':
  jpeg2000: enable 4 component pixel formats

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5836fe20c686fa9fe6a85afe306485b312ad1698
---