[FFmpeg-cvslog] Merge commit '6598aaea1ad2cf82d40abb191ac26a5e4e5147ba' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 11 18:40:00 2014 +0200| [7b67ce9ade01abcf0d5d08ada62011b43526a646] | committer: Michael Niedermayer

Merge commit '6598aaea1ad2cf82d40abb191ac26a5e4e5147ba' into release/2.2

* commit '6598aaea1ad2cf82d40abb191ac26a5e4e5147ba':
  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=7b67ce9ade01abcf0d5d08ada62011b43526a646
---