Merge commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 14:00:40 +0000 (16:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 14:00:45 +0000 (16:00 +0200)
commit99e7c702db5c42a79aaa48c502fec3e15d8cf308
treef67ba9c0b47189d7821f42890e67398d20282150
parent01cac26f6848a809aba3f08e45d8c339702d90a9
parentbd549cbaacd33dfb7be81d0619c9b107b8a85be7
Merge commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7'

* commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7':
  arm: dcadsp: Move synth filter initialization to dcadsp file

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