Merge commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/arm/fmtconvert_init_arm.c
Simple merge

diff --cc libavcodec/arm/fmtconvert_vfp.S
index 7b012bc8d8129ea00f5535067a93e29760edbbc8,349c198c9689c16c1a90785a3c13c416046d8678..3cc3e56d0c4a46b50609c98da01255d29d8a7048
--- 1/libavcodec/arm/fmtconvert_vfp.S
--- 2/libavcodec/arm/fmtconvert_vfp.S
+++ b/libavcodec/arm/fmtconvert_vfp.S
@@@ -1,9 -1,10 +1,10 @@@
  /*
   * Copyright (c) 2008 Siarhei Siamashka <ssvb@users.sourceforge.net>
+  * Copyright (c) 2013 RISC OS Open Ltd <bavison@riscosopen.org>
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.