Merge https://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 May 2012 20:39:29 +0000 (22:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 May 2012 20:40:19 +0000 (22:40 +0200)
* https://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder:
  libopenjpegdec: respect JP2 color space, fix ticket 1179

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

Trivial merge