diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 14:19:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 14:19:55 +0100 |
| commit | 89c8eaa3216a48c1d18cc390525e90db74513f0c (patch) | |
| tree | 390a2684c7821394702fcf644f13aedcf54d0290 /libavcodec/arm/mathops.h | |
| parent | ee9e7a2e7a66501d5596f6bb992dc6afeaad8ec7 (diff) | |
| parent | 637606de2d2e0af0a9fa2f23f943765d7d7c5cd5 (diff) | |
| download | ffmpeg-89c8eaa3216a48c1d18cc390525e90db74513f0c.tar.gz | |
Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'
* commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5':
configure: arm: make _inline arch ext symbols depend on inline_asm
arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation
Conflicts:
configure
libavcodec/arm/dca.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/mathops.h')
| -rw-r--r-- | libavcodec/arm/mathops.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/arm/mathops.h b/libavcodec/arm/mathops.h index 9313d6bbb0..dc57c5571c 100644 --- a/libavcodec/arm/mathops.h +++ b/libavcodec/arm/mathops.h @@ -28,7 +28,7 @@ #if HAVE_INLINE_ASM -#if HAVE_ARMV6 +#if HAVE_ARMV6_INLINE #define MULH MULH static inline av_const int MULH(int a, int b) { @@ -50,7 +50,7 @@ static av_always_inline av_const int FASTDIV(int a, int b) return r; } -#else /* HAVE_ARMV6 */ +#else /* HAVE_ARMV6_INLINE */ #define FASTDIV FASTDIV static av_always_inline av_const int FASTDIV(int a, int b) @@ -64,7 +64,7 @@ static av_always_inline av_const int FASTDIV(int a, int b) #define MLS64(d, a, b) MAC64(d, -(a), b) -#if HAVE_ARMV5TE +#if HAVE_ARMV5TE_INLINE /* signed 16x16 -> 32 multiply add accumulate */ # define MAC16(rt, ra, rb) \ |