Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'

[ffmpeg] / libavcodec / me_cmp.c

diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c
index cfd14abb0120e3e8abd1f7e60dd234bf0fac3eda..d4213d2759eefd9498f8cc2e5f7f7ef279e5a2f2 100644 (file)
--- a/libavcodec/me_cmp.c
+++ b/libavcodec/me_cmp.c
@@ -108,8 +108,8 @@ static int sum_abs_dctelem_c(int16_t *block)
     return sum;
 }
 
-#define avg2(a, b) ((a + b + 1) >> 1)
-#define avg4(a, b, c, d) ((a + b + c + d + 2) >> 2)
+#define avg2(a, b) (((a) + (b) + 1) >> 1)
+#define avg4(a, b, c, d) (((a) + (b) + (c) + (d) + 2) >> 2)
 
 static inline int pix_abs16_c(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
                               ptrdiff_t stride, int h)