generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-12-08 14:19:55 +01:00
parent ee9e7a2e7a 637606de2d
commit 89c8eaa321
11 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/arm/intmath.h
View File

@@ -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