Merge commit '57b1eb9f75b04571063ddec316e290c216c114ac'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 18:40:18 +0000 (19:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 18:40:40 +0000 (19:40 +0100)
* commit '57b1eb9f75b04571063ddec316e290c216c114ac':
  dcadsp: scan coefficients linearly in dca_lfe_fir

Conflicts:
libavcodec/dcadsp.c

See: 9ae8e23188fc2e533eea74757c9060557941d3d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dcadsp.c

Simple merge