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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  2 04:48:35 2012 +0200| [96cb1438000075cae2a7f33a1b794df27f18284b] | committer: Michael Niedermayer

Merge remote-tracking branch 'dwbuiten/master'

* dwbuiten/master:
  Canopus Lossless decoder

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

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