Merge commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 09:42:11 +0000 (11:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 09:42:19 +0000 (11:42 +0200)
commit877bbe05cef00c63b6e2263f69d1f6f3c61182c3
treeba9b9d95883c16a5f0212dd5dd8d8aefe45943c4
parent0129026c4e62d439c51cdae32a6b30ee278cae14
parentce9ed10ac27b9cf32a6257e083ea2f052692d971
Merge commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971'

* commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971':
  arm: Add VFP-accelerated version of int32_to_float_fmul_scalar

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