diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-11-24 09:28:55 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-11-24 09:28:55 +0000 |
| commit | 4deaa94639148297cef58d35bc25ebcab45e9111 (patch) | |
| tree | 03a79a4895415234e3ec75717864a5411eefda01 /libavcodec/armv4l | |
| parent | 8f5aaa6d2fde23d372c80844514103c93088b2f2 (diff) | |
Add shift argument to MULL() macro
This replaces use of FRAC_BITS in the MULL() definition with a third
argument specifying the shift amount. All uses of this macro are
updated to pass FRAC_BITS as third argument.
Originally committed as revision 15921 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/armv4l')
| -rw-r--r-- | libavcodec/armv4l/mathops.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/armv4l/mathops.h b/libavcodec/armv4l/mathops.h index 37a0d3fcac..f8a3d6db40 100644 --- a/libavcodec/armv4l/mathops.h +++ b/libavcodec/armv4l/mathops.h @@ -25,19 +25,17 @@ #include <stdint.h> #include "libavutil/common.h" -#ifdef FRAC_BITS # define MULL MULL -static inline av_const int MULL(int a, int b) +static inline av_const int MULL(int a, int b, unsigned shift) { int lo, hi; __asm__("smull %0, %1, %2, %3 \n\t" "mov %0, %0, lsr %4 \n\t" "add %1, %0, %1, lsl %5 \n\t" : "=&r"(lo), "=&r"(hi) - : "r"(b), "r"(a), "i"(FRAC_BITS), "i"(32-FRAC_BITS)); + : "r"(b), "r"(a), "i"(shift), "i"(32-shift)); return hi; } -#endif #define MULH MULH #ifdef HAVE_ARMV6 |