Merge commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 09:55:20 +0000 (11:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 09:55:40 +0000 (11:55 +0200)
commit3cab2280058c582102346a50a8a503216055bc2d
treee05718f7eb214b3d4ce7c6c99a9af822945f9e30
parent1573274b914ed67ed6a71a02eddd4e874f1c54bd
parentd6e4f5fef0d811e180fd7541941e07dca9e11dc0
Merge commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0'

* commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0':
  arm: Add VFP-accelerated version of int32_to_float_fmul_array8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/fmtconvert_init_arm.c
libavcodec/arm/fmtconvert_vfp.S