aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-21 11:15:18 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-21 11:15:32 +0100
commit1253091d6f7b2910f3a53ab648fb3d0cb1a4b4ee (patch)
tree0b51bc4436d4b4a5cca1e58210b8edd598afd83f
parent88d850ecb3ed32da84fdbbfa9d9b6097135b321f (diff)
parent76ce9bd8e26dcb3652240a1072840ff4011d7cdc (diff)
downloadffmpeg-1253091d6f7b2910f3a53ab648fb3d0cb1a4b4ee.tar.gz
Merge commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc'
* commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc': libavutil: Add ARM av_clip_intp2_arm Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/arm/intmath.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h
index fd52648f88..3216af003a 100644
--- a/libavutil/arm/intmath.h
+++ b/libavutil/arm/intmath.h
@@ -62,6 +62,14 @@ static av_always_inline av_const int av_clip_int16_arm(int a)
return x;
}
+#define av_clip_intp2 av_clip_intp2_arm
+static av_always_inline av_const int av_clip_intp2_arm(int a, int p)
+{
+ unsigned x;
+ __asm__ ("ssat %0, %2, %1" : "=r"(x) : "r"(a), "i"(p+1));
+ return x;
+}
+
#define av_clip_uintp2 av_clip_uintp2_arm
static av_always_inline av_const unsigned av_clip_uintp2_arm(int a, int p)
{