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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 21 22:43:17 2011 +0100| [7f6a0190963f99c9b90dc58f17f8d450d2a4f98e] | committer: Michael Niedermayer

Merge remote-tracking branch 'mjbshaw/master'

* mjbshaw/master:
  Applied patches from Michael Niedermayer to clean up the code
  Added support for J2K encoding with libopenjpeg

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

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