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/aac.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/aac.h')
| -rw-r--r-- | libavcodec/arm/aac.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/aac.h b/libavcodec/arm/aac.h index bd4d293f02..cafa881fc7 100644 --- a/libavcodec/arm/aac.h +++ b/libavcodec/arm/aac.h @@ -23,7 +23,7 @@ #include "config.h" -#if HAVE_NEON && HAVE_INLINE_ASM +#if HAVE_NEON_INLINE #define VMUL2 VMUL2 static inline float *VMUL2(float *dst, const float *v, unsigned idx, @@ -138,6 +138,6 @@ static inline float *VMUL4S(float *dst, const float *v, unsigned idx, return dst; } -#endif /* HAVE_NEON && HAVE_INLINE_ASM */ +#endif /* HAVE_NEON_INLINE */ #endif /* AVCODEC_ARM_AAC_H */ |