diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-05 02:33:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-05 03:00:31 +0200 |
| commit | 46eb300d016b69b5fedb0410df98e3c698090c8c (patch) | |
| tree | 7aa230d9098654e1ce94bc32c2cfb8f1463e9e3b /libavcodec/mathops.h | |
| parent | 124a9edb5f172ce36b11fd0d6ccc9f15cc51f322 (diff) | |
| parent | 594fbe42c6b21aef76b938ce97524fa92a48e7a0 (diff) | |
| download | ffmpeg-46eb300d016b69b5fedb0410df98e3c698090c8c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: remove MULL inline asm
mathops: use MUL64 macro where it forms part of other ops
tty: factorise returning error codes.
rawdec: add framerate private option.
x11grab: add framerate private option.
fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base.
bktr: don't error when AVFormatParameters.time_base isn't set.
cmdutils: add missing const qualifier
Skip headers not designed to work standalone during 'make checkheaders'.
Add missing #includes to make headers self-contained.
musepack: remove unnecessary #include from mpcdata.h
musepack: remove extraneous mpcdata.h inclusions
Fix error check in av_file_map()
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mathops.h')
| -rw-r--r-- | libavcodec/mathops.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index 29b3cd0acb..0477cfdce3 100644 --- a/libavcodec/mathops.h +++ b/libavcodec/mathops.h @@ -23,6 +23,7 @@ #define AVCODEC_MATHOPS_H #include "libavutil/common.h" +#include "config.h" #if ARCH_ARM # include "arm/mathops.h" @@ -40,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 @@ -56,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 |