Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:58:24 +0000 (12:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:58:29 +0000 (12:58 +0100)
commit845fa2f5c9643a2f80b29614351609f1f1d3994d
tree7a3b1136b62cfaeb8889e1709a225c52ab207edb
parent91043de8256fa87a0a20cc3a139f668110257dbe
parent157542ebc15dd175e5b4d14ffa92afd74ab4a991
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: fix mixing matrix reduction when normalization is disabled
  lavr: fix matrix reduction for upmixing in certain cases
  lavr: cosmetics: reindent

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