Merge remote-tracking branch 'dwbuiten/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 2 Aug 2012 02:48:35 +0000 (04:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 2 Aug 2012 02:48:47 +0000 (04:48 +0200)
* dwbuiten/master:
  Canopus Lossless decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/Makefile

Simple merge