From e493c5cb40e7bbf27339930a2149d63b108cbf40 Mon Sep 17 00:00:00 2001 From: theuni Date: Sat, 5 May 2012 20:02:35 -0400 Subject: [droid] ffmpeg compile fix for -Os --- lib/ffmpeg/libavutil/arm/intmath.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ffmpeg/libavutil/arm/intmath.h b/lib/ffmpeg/libavutil/arm/intmath.h index 52af66e722..4ebe562632 100644 --- a/lib/ffmpeg/libavutil/arm/intmath.h +++ b/lib/ffmpeg/libavutil/arm/intmath.h @@ -75,6 +75,8 @@ static av_always_inline av_const int16_t av_clip_int16_arm(int a) return x; } +/* Android fix. See: http://patches.libav.org/patch/3525/ */ +#if !defined(ANDROID) #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 +84,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 #else /* HAVE_ARMV6 */ -- cgit v1.2.3