[FFmpeg-cvslog] Merge remote-tracking branch 'mjbshaw/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb  1 02:33:37 2013 +0100| [ffd02d0c197449052488b6867280dedd5425e94a] | committer: Michael Niedermayer

Merge remote-tracking branch 'mjbshaw/master'

* mjbshaw/master:
  libopenjpegenc: simplify switch statement
  libopenjpegenc: add support for pix fmt gbrp (8-16 bit)

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

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