Merge commit '7686afd049be98d18663682b92d983340fa2c305'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 20:29:45 +0000 (21:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 20:32:14 +0000 (21:32 +0100)
commit747b0337e70b99bed24c440e35bd14b33e1c2d99
treedfccb64b975037e4f10c7fcb1b415037821b5a57
parentbaf3adc621feed563f0d12479519c600b26b768c
parent7686afd049be98d18663682b92d983340fa2c305
Merge commit '7686afd049be98d18663682b92d983340fa2c305'

* commit '7686afd049be98d18663682b92d983340fa2c305':
  dca: factorize scaling in inverse ADPCM

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