diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-12 23:04:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-15 00:52:42 +0200 |
| commit | a5069caecdc5a58930f9021a0b4f89ecffb320f5 (patch) | |
| tree | cdf9b0135cc26c5a0b271bd65de4f2e24451958c | |
| parent | b5e72345a63e04ba45c01fa5c9284ef7c03bc4cf (diff) | |
| download | ffmpeg-a5069caecdc5a58930f9021a0b4f89ecffb320f5.tar.gz | |
arm/intmath: disable av_clip_uintp2_arm with config_small
The code otherwise breaks compilation (gcc 4.5 tested but probably any compiler)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2942431a0f94ecb77744a772c164ab71711ffe19)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/arm/intmath.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h index 52af66e722..f5a59a6928 100644 --- a/libavutil/arm/intmath.h +++ b/libavutil/arm/intmath.h @@ -75,6 +75,7 @@ static av_always_inline av_const int16_t av_clip_int16_arm(int a) return x; } +#if !CONFIG_SMALL //the code below cannot be compiled without always_inline #define av_clip_uintp2 av_clip_uintp2_arm static av_always_inline av_const unsigned av_clip_uintp2_arm(int a, int p) { @@ -82,7 +83,7 @@ static av_always_inline av_const unsigned av_clip_uintp2_arm(int a, int p) __asm__ ("usat %0, %2, %1" : "=r"(x) : "r"(a), "i"(p)); return x; } - +#endif //!CONFIG_SMALL #else /* HAVE_ARMV6 */ |