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/vp8dsp_armv6.S | |
| 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/vp8dsp_armv6.S')
| -rw-r--r-- | libavcodec/arm/vp8dsp_armv6.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/arm/vp8dsp_armv6.S b/libavcodec/arm/vp8dsp_armv6.S index 40be926f9f..fd254ccc30 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 |