diff options
| author | theuni <theuni-nospam-@xbmc.org> | 2012-05-05 20:02:35 -0400 |
|---|---|---|
| committer | Cory Fields <theuni-nospam-@xbmc.org> | 2012-08-08 18:47:59 -0400 |
| commit | e493c5cb40e7bbf27339930a2149d63b108cbf40 (patch) | |
| tree | d86c43f4810a7c8e27f9cbbb144691275517abe6 /lib | |
| parent | 4088cf014bb4686cccd68f7ac173c49cf5b4a557 (diff) | |
[droid] ffmpeg compile fix for -Os
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ffmpeg/libavutil/arm/intmath.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 */ |