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 /libavutil/arm/intmath.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 'libavutil/arm/intmath.h')
| -rw-r--r-- | libavutil/arm/intmath.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h index 0980a6f3b7..fd52648f88 100644 --- a/libavutil/arm/intmath.h +++ b/libavutil/arm/intmath.h @@ -28,7 +28,7 @@ #if HAVE_INLINE_ASM -#if HAVE_ARMV6 +#if HAVE_ARMV6_INLINE #define av_clip_uint8 av_clip_uint8_arm static av_always_inline av_const unsigned av_clip_uint8_arm(int a) @@ -86,7 +86,7 @@ static av_always_inline int av_sat_dadd32_arm(int a, int b) return r; } -#endif /* HAVE_ARMV6 */ +#endif /* HAVE_ARMV6_INLINE */ #if HAVE_ASM_MOD_Q |