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 | |
parent | ee9e7a2e7a66501d5596f6bb992dc6afeaad8ec7 (diff) | |
parent | 637606de2d2e0af0a9fa2f23f943765d7d7c5cd5 (diff) | |
download | ffmpeg-streaming-89c8eaa3216a48c1d18cc390525e90db74513f0c.zip ffmpeg-streaming-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')
-rw-r--r-- | libavcodec/arm/aac.h | 4 | ||||
-rw-r--r-- | libavcodec/arm/dca.h | 4 | ||||
-rw-r--r-- | libavcodec/arm/dsputil_arm.S | 2 | ||||
-rw-r--r-- | libavcodec/arm/mathops.h | 6 | ||||
-rw-r--r-- | libavcodec/arm/vp56_arith.h | 2 | ||||
-rw-r--r-- | libavcodec/arm/vp8.h | 2 | ||||
-rw-r--r-- | libavcodec/arm/vp8dsp_armv6.S | 6 |
7 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/arm/aac.h b/libavcodec/arm/aac.h index bd4d293..cafa881 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 */ diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h index 05be789..3b341cf 100644 --- a/libavcodec/arm/dca.h +++ b/libavcodec/arm/dca.h @@ -25,7 +25,7 @@ #include "config.h" #include "libavutil/intmath.h" -#if HAVE_ARMV6 && HAVE_INLINE_ASM && AV_GCC_VERSION_AT_LEAST(4,4) && !CONFIG_THUMB +#if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4) && !CONFIG_THUMB #define decode_blockcodes decode_blockcodes static inline int decode_blockcodes(int code1, int code2, int levels, @@ -79,7 +79,7 @@ static inline int decode_blockcodes(int code1, int code2, int levels, #endif -#if HAVE_NEON && HAVE_INLINE_ASM && HAVE_ASM_MOD_Y +#if HAVE_NEON_INLINE && HAVE_ASM_MOD_Y #define int8x8_fmul_int32 int8x8_fmul_int32 static inline void int8x8_fmul_int32(float *dst, const int8_t *src, int scale) diff --git a/libavcodec/arm/dsputil_arm.S b/libavcodec/arm/dsputil_arm.S index d665ab3..9c9bd25 100644 --- a/libavcodec/arm/dsputil_arm.S +++ b/libavcodec/arm/dsputil_arm.S @@ -22,7 +22,7 @@ #include "config.h" #include "libavutil/arm/asm.S" -#if HAVE_ARMV5TE +#if HAVE_ARMV5TE_EXTERNAL function ff_prefetch_arm, export=1 subs r2, r2, #1 pld [r0] diff --git a/libavcodec/arm/mathops.h b/libavcodec/arm/mathops.h index 9313d6b..dc57c55 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) \ diff --git a/libavcodec/arm/vp56_arith.h b/libavcodec/arm/vp56_arith.h index 29a2228..feb1247 100644 --- a/libavcodec/arm/vp56_arith.h +++ b/libavcodec/arm/vp56_arith.h @@ -37,7 +37,7 @@ # define U(x) #endif -#if HAVE_ARMV6 && HAVE_INLINE_ASM +#if HAVE_ARMV6_INLINE #define vp56_rac_get_prob vp56_rac_get_prob_armv6 static inline int vp56_rac_get_prob_armv6(VP56RangeCoder *c, int pr) diff --git a/libavcodec/arm/vp8.h b/libavcodec/arm/vp8.h index 5a7b142..7574a51 100644 --- a/libavcodec/arm/vp8.h +++ b/libavcodec/arm/vp8.h @@ -21,7 +21,7 @@ #include "config.h" -#if HAVE_ARMV6 +#if HAVE_ARMV6_EXTERNAL #define decode_block_coeffs_internal ff_decode_block_coeffs_armv6 int ff_decode_block_coeffs_armv6(VP56RangeCoder *rc, DCTELEM block[16], uint8_t probs[8][3][NUM_DCT_TOKENS-1], diff --git a/libavcodec/arm/vp8dsp_armv6.S b/libavcodec/arm/vp8dsp_armv6.S index 40be926..fd254cc 100644 --- a/libavcodec/arm/vp8dsp_armv6.S +++ b/libavcodec/arm/vp8dsp_armv6.S @@ -118,7 +118,7 @@ function ff_vp8_luma_dc_wht_armv6, export=1 usub16 r4, r4, r6 @ block[0,1][3] usub16 r5, r5, r12 @ block[2,3][3] -#if HAVE_ARMV6T2 +#if HAVE_ARMV6T2_EXTERNAL sbfx r6, r8, #3, #13 sbfx r12, r7, #3, #13 sbfx r1, r9, #3, #13 @@ -151,7 +151,7 @@ function ff_vp8_luma_dc_wht_armv6, export=1 strh r4, [r0], #32 asr r10, r5, #19 @ block[3][3] -#if HAVE_ARMV6T2 +#if HAVE_ARMV6T2_EXTERNAL sbfx r2, r2, #3, #13 sbfx lr, lr, #3, #13 sbfx r3, r3, #3, #13 @@ -284,7 +284,7 @@ function ff_vp8_idct_add_armv6, export=1 sxth r12, r12 ldr r9, [r0, r2] sxth r1, r1 -#if HAVE_ARMV6T2 +#if HAVE_ARMV6T2_EXTERNAL sbfx r7, r7, #3, #13 sbfx r10, r10, #3, #13 #else |