diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:26:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:26:46 +0200 |
| commit | e335658370840390272b70de92f5a76860537fb9 (patch) | |
| tree | 8f9074bfd2d0f5c6c09c34f23b354ee9dbce7e56 /libavutil/arm | |
| parent | 43cce41267a7aa71946911e87b4dfce48183bb25 (diff) | |
| parent | 9734b8ba56d05e970c353dfd5baafa43fdb08024 (diff) | |
| download | ffmpeg-e335658370840390272b70de92f5a76860537fb9.tar.gz | |
Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'
* commit '9734b8ba56d05e970c353dfd5baafa43fdb08024':
Move avutil tables only used in libavcodec to libavcodec.
Conflicts:
libavcodec/mathtables.c
libavutil/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm')
| -rw-r--r-- | libavutil/arm/intmath.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h index 0ab0d4c6f8..0980a6f3b7 100644 --- a/libavutil/arm/intmath.h +++ b/libavutil/arm/intmath.h @@ -30,19 +30,6 @@ #if HAVE_ARMV6 -#define FASTDIV FASTDIV -static av_always_inline av_const int FASTDIV(int a, int b) -{ - int r; - __asm__ ("cmp %2, #2 \n\t" - "ldr %0, [%3, %2, lsl #2] \n\t" - "ite le \n\t" - "lsrle %0, %1, #1 \n\t" - "smmulgt %0, %0, %1 \n\t" - : "=&r"(r) : "r"(a), "r"(b), "r"(ff_inverse) : "cc"); - return r; -} - #define av_clip_uint8 av_clip_uint8_arm static av_always_inline av_const unsigned av_clip_uint8_arm(int a) { @@ -99,17 +86,6 @@ static av_always_inline int av_sat_dadd32_arm(int a, int b) return r; } -#else /* HAVE_ARMV6 */ - -#define FASTDIV FASTDIV -static av_always_inline av_const int FASTDIV(int a, int b) -{ - int r, t; - __asm__ ("umull %1, %0, %2, %3" - : "=&r"(r), "=&r"(t) : "r"(a), "r"(ff_inverse[b])); - return r; -} - #endif /* HAVE_ARMV6 */ #if HAVE_ASM_MOD_Q |