Merge remote-tracking branch 'mjbshaw/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Feb 2013 01:33:37 +0000 (02:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Feb 2013 01:33:42 +0000 (02:33 +0100)
* mjbshaw/master:
  libopenjpegenc: simplify switch statement
  libopenjpegenc: add support for pix fmt gbrp (8-16 bit)

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

Trivial merge