Merge commit '87ec849fe9acba075c843e67bcd01f256f481a18'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 17:14:12 +0000 (18:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 17:14:12 +0000 (18:14 +0100)
commit90f674d55bd76e23a70ed68b8cb104b5d8b9505f
tree97cdcf9e74c427c904dce33dd8fabc7b17a6bee7
parent810eb285e38dac89a0c04a87f1c8ce17a8bec770
parent87ec849fe9acba075c843e67bcd01f256f481a18
Merge commit '87ec849fe9acba075c843e67bcd01f256f481a18'

* commit '87ec849fe9acba075c843e67bcd01f256f481a18':
  dcadec: remove scaling in lfe_interpolation_fir

Conflicts:
libavcodec/dcadec.c
libavcodec/dcadsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/dcadsp_init_arm.c
libavcodec/arm/dcadsp_neon.S
libavcodec/arm/dcadsp_vfp.S
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/dcadsp.c
libavcodec/dcadsp.h