commit a5069caecdc5a58930f9021a0b4f89ecffb320f5
author Michael Niedermayer <michaelni@gmx.at> Tue Jun 12 23:04:16 2012 +0200
committer Michael Niedermayer <michaelni@gmx.at> Sat Sep 15 00:52:42 2012 +0200
tree cdf9b0135cc26c5a0b271bd65de4f2e24451958c
parent b5e72345a63e04ba45c01fa5c9284ef7c03bc4cf

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>

libavutil/arm/intmath.h

diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h
index 52af66e..f5a59a6 100644
--- a/libavutil/arm/intmath.h
+++ b/libavutil/arm/intmath.h
@@ -75,6 +75,7 @@
     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 @@
     __asm__ ("usat %0, %2, %1" : "=r"(x) : "r"(a), "i"(p));
     return x;
 }
-
+#endif //!CONFIG_SMALL
 
 #else /* HAVE_ARMV6 */