git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
17a62cb
)
avcodec/me_cmp: add () to protect avg*s arguments
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Feb 2015 22:13:00 +0000
(23:13 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Feb 2015 22:13:00 +0000
(23:13 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/me_cmp.c
patch
|
blob
|
history
diff --git
a/libavcodec/me_cmp.c
b/libavcodec/me_cmp.c
index
cfd14ab
..
d4213d2
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)