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)
commit96cb1438000075cae2a7f33a1b794df27f18284b
treeb333a2202a920ba5f47494479feb6709b493cdc8
parent571572fcddc16ebe3d60054ae5a2db05800c1d6d
parent91c86d3cf8064b3ff28c66a48d3e0c7187df1ab8
Merge remote-tracking branch 'dwbuiten/master'

* dwbuiten/master:
  Canopus Lossless decoder

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