Signed-off-by: Mans Rullgard <[email protected]>
---
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
--
1.7.5.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
