diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-06-04 17:52:30 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-06-04 20:10:20 +0100 |
| commit | 95912731c2eb37b538a767b2ff2b8149b16f0bde (patch) | |
| tree | 2bccb5e5cc3d2f2268fae6c54c11298807982a94 /libavcodec/mathops.h | |
| parent | 8346f60afbb23b9a3dcef8e6683060f71ec296e2 (diff) | |
| download | ffmpeg-streaming-95912731c2eb37b538a767b2ff2b8149b16f0bde.zip ffmpeg-streaming-95912731c2eb37b538a767b2ff2b8149b16f0bde.tar.gz | |
mathops: use MUL64 macro where it forms part of other ops
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/mathops.h')
| -rw-r--r-- | libavcodec/mathops.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index 98c9acf..ec76eaa 100644 --- a/libavcodec/mathops.h +++ b/libavcodec/mathops.h @@ -41,13 +41,17 @@ /* generic implementation */ +#ifndef MUL64 +# define MUL64(a,b) ((int64_t)(a) * (int64_t)(b)) +#endif + #ifndef MULL -# define MULL(a,b,s) (((int64_t)(a) * (int64_t)(b)) >> (s)) +# define MULL(a,b,s) (MUL64(a, b) >> (s)) #endif #ifndef MULH static av_always_inline int MULH(int a, int b){ - return ((int64_t)(a) * (int64_t)(b))>>32; + return MUL64(a, b) >> 32; } #endif @@ -57,10 +61,6 @@ static av_always_inline unsigned UMULH(unsigned a, unsigned b){ } #endif -#ifndef MUL64 -# define MUL64(a,b) ((int64_t)(a) * (int64_t)(b)) -#endif - #ifndef MAC64 # define MAC64(d, a, b) ((d) += MUL64(a, b)) #endif |
