diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-06-14 11:29:48 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-06-23 07:31:54 +0100 |
| commit | 8986fddc2bab92bd7d77a123ac70c4fb70c96c7c (patch) | |
| tree | 73b8c4a57c98be10d4403dc69ec3019a1665b3f0 /libavcodec/arm/fmtconvert_vfp.S | |
| parent | 9cd7b8549b71bcfced2062596fd9eecba092aeb1 (diff) | |
| download | ffmpeg-8986fddc2bab92bd7d77a123ac70c4fb70c96c7c.tar.gz | |
ARM: allow building in Thumb2 mode
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/arm/fmtconvert_vfp.S')
| -rw-r--r-- | libavcodec/arm/fmtconvert_vfp.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/arm/fmtconvert_vfp.S b/libavcodec/arm/fmtconvert_vfp.S index 1bb7f49801..f7b0e3dcb5 100644 --- a/libavcodec/arm/fmtconvert_vfp.S +++ b/libavcodec/arm/fmtconvert_vfp.S @@ -46,6 +46,7 @@ function ff_float_to_int16_vfp, export=1 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 @@ -53,10 +54,12 @@ function ff_float_to_int16_vfp, export=1 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 |