[FFmpeg-cvslog] Merge https://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  3 22:39:29 2012 +0200| [d98b254ab8b8336c6335b5ffbba58145c4608620] | committer: Michael Niedermayer

Merge https://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder

* https://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder:
  libopenjpegdec: respect JP2 color space, fix ticket 1179

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

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