Merge remote-tracking branch 'mjbshaw/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Nov 2011 21:43:17 +0000 (22:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Nov 2011 22:04:02 +0000 (23:04 +0100)
* mjbshaw/master:
  Applied patches from Michael Niedermayer to clean up the code
  Added support for J2K encoding with libopenjpeg

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

Trivial merge