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)
* commit '149438cfe5d233c46bb18341b7c574fe643dd5f2':
  dca: improve default stereo downmix coefficients.

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

Simple merge