Merge git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Jul 2012 10:15:41 +0000 (12:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Jul 2012 10:15:48 +0000 (12:15 +0200)
* git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder:
  libopenjpegdec: add support for decoding YUV420/422/444P12/14
  libopenjpegenc: cosmetics: reorder pix_fmts
  libopenjpegenc: add support for YUV420/422/444P12/14

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

Trivial merge