Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc'

* commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc':
  arm: fmtconvert: Split armv6 fmtconvert code off from vfp code

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 a6d4ebdbbc0f899a29297525883c607dfedb73a1,4e43f425a50c3d09c12130e9958548f6d8f09f90..b14af454ebf2b6720ac3e156a07b99be0b520c03
--- 1/libavcodec/arm/fmtconvert_vfp.S
--- 2/libavcodec/arm/fmtconvert_vfp.S
+++ b/libavcodec/arm/fmtconvert_vfp.S
@@@ -1,10 -1,9 +1,9 @@@
  /*
-  * 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.

diff --cc libavcodec/arm/fmtconvert_vfp_armv6.S
index 0000000000000000000000000000000000000000,fb12de1368c3d9a53aae779629650df33dcd0e97..7b012bc8d8129ea00f5535067a93e29760edbbc8
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/arm/fmtconvert_vfp_armv6.S
+++ b/libavcodec/arm/fmtconvert_vfp_armv6.S
@@@ -1,0 -1,78 +1,78 @@@
 - * This file is part of Libav.
+ /*
+  * Copyright (c) 2008 Siarhei Siamashka <ssvb@users.sourceforge.net>
+  *
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ #include "config.h"
+ #include "libavutil/arm/asm.S"
+ 
+ /**
+  * ARM VFP optimized float to int16 conversion.
+  * Assume that len is a positive number and is multiple of 8, destination
+  * buffer is at least 4 bytes aligned (8 bytes alignment is better for
+  * performance), little-endian byte sex.
+  */
+ @ void ff_float_to_int16_vfp(int16_t *dst, const float *src, int len)
+ function ff_float_to_int16_vfp, export=1
+         push            {r4-r8,lr}
+         vpush           {d8-d11}
+         vldmia          r1!, {s16-s23}
+         vcvt.s32.f32    s0,  s16
+         vcvt.s32.f32    s1,  s17
+         vcvt.s32.f32    s2,  s18
+         vcvt.s32.f32    s3,  s19
+         vcvt.s32.f32    s4,  s20
+         vcvt.s32.f32    s5,  s21
+         vcvt.s32.f32    s6,  s22
+         vcvt.s32.f32    s7,  s23
+ 1:
+         subs            r2,  r2,  #8
+         vmov            r3,  r4,  s0, s1
+         vmov            r5,  r6,  s2, s3
+         vmov            r7,  r8,  s4, s5
+         vmov            ip,  lr,  s6, s7
+         it              gt
+         vldmiagt        r1!, {s16-s23}
+         ssat            r4,  #16, r4
+         ssat            r3,  #16, r3
+         ssat            r6,  #16, r6
+         ssat            r5,  #16, r5
+         pkhbt           r3,  r3,  r4, lsl #16
+         pkhbt           r4,  r5,  r6, lsl #16
+         itttt           gt
+         vcvtgt.s32.f32  s0,  s16
+         vcvtgt.s32.f32  s1,  s17
+         vcvtgt.s32.f32  s2,  s18
+         vcvtgt.s32.f32  s3,  s19
+         itttt           gt
+         vcvtgt.s32.f32  s4,  s20
+         vcvtgt.s32.f32  s5,  s21
+         vcvtgt.s32.f32  s6,  s22
+         vcvtgt.s32.f32  s7,  s23
+         ssat            r8,  #16, r8
+         ssat            r7,  #16, r7
+         ssat            lr,  #16, lr
+         ssat            ip,  #16, ip
+         pkhbt           r5,  r7,  r8, lsl #16
+         pkhbt           r6,  ip,  lr, lsl #16
+         stmia           r0!, {r3-r6}
+         bgt             1b
+ 
+         vpop            {d8-d11}
+         pop             {r4-r8,pc}
+ endfunc