diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-04 00:32:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-04 00:32:31 +0200 |
| commit | 86e107a7d468666189506d3edd4f4b5ca14cd59e (patch) | |
| tree | 7270750bbe78c241461a844d7c1c8de3696e3765 /libavutil/arm | |
| parent | af392efe51d5cc3536cb3c75bce8954179222d18 (diff) | |
| parent | 1a068bfefd5da09f596e5079b39b418933bad0ea (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: Consistently use C-style comments with multiple inclusion guards
anm: fix a few Doxygen comments
misc typo and wording fixes
attributes: add av_noreturn
attributes: drop pointless define guards
configure: do not disable av_always_inline with --enable-small
flvdec: initial stream switch support
avplay: fix write on freed memory for rawvideo
snow: remove a VLA used for edge emulation
x86: lavfi: fix gradfun/yadif build with mmx/sse disabled
snow: remove the runs[] VLA.
snow: Check mallocs at init
flacdec: remove redundant setting of avctx->sample_fmt
Conflicts:
ffplay.c
libavcodec/h264.c
libavcodec/snow.c
libavcodec/snow.h
libavcodec/snowdec.c
libavcodec/snowenc.c
libavformat/flvdec.c
libavutil/attributes.h
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm')
| -rw-r--r-- | libavutil/arm/intmath.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h index f5a59a6928..52af66e722 100644 --- a/libavutil/arm/intmath.h +++ b/libavutil/arm/intmath.h @@ -75,7 +75,6 @@ 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) { @@ -83,7 +82,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 */ |