Merge commit '149438cfe5d233c46bb18341b7c574fe643dd5f2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 02:48:11 +0000 (03:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 02:48:29 +0000 (03:48 +0100)
commit7ea9c4a94c139aafabba8fe9746e1a8d71e656d3
treeb171e69c0a62e8b4943feb4d5820e0c5dfcd0565
parent12235a3ed29c11b7983d43b843696297efb01249
parent149438cfe5d233c46bb18341b7c574fe643dd5f2
Merge commit '149438cfe5d233c46bb18341b7c574fe643dd5f2'

* commit '149438cfe5d233c46bb18341b7c574fe643dd5f2':
  dca: improve default stereo downmix coefficients.

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