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:
cb9d404
)
avcodec/vc1dsp: add () to protect the arguments of the op* macros
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Feb 2015 23:02:40 +0000
(
00:02
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Feb 2015 23:02:40 +0000
(
00:02
+0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vc1dsp.c
patch
|
blob
|
history
diff --git
a/libavcodec/vc1dsp.c
b/libavcodec/vc1dsp.c
index
73e1001
..
a16c8d5
100644
(file)
--- a/
libavcodec/vc1dsp.c
+++ b/
libavcodec/vc1dsp.c
@@
-723,10
+723,10
@@
static void OPNAME ## pixels16x16_c(uint8_t *block, const uint8_t *pixels, ptrdi
}\
}
-#define op_put(a, b)
a
= av_clip_uint8(b)
-#define op_avg(a, b)
a = (a
+ av_clip_uint8(b) + 1) >> 1
-#define op4_avg(a, b)
a
= rnd_avg32(a, b)
-#define op4_put(a, b)
a = b
+#define op_put(a, b)
(a)
= av_clip_uint8(b)
+#define op_avg(a, b)
(a) = ((a)
+ av_clip_uint8(b) + 1) >> 1
+#define op4_avg(a, b)
(a)
= rnd_avg32(a, b)
+#define op4_put(a, b)
(a) = (b)
VC1_MSPEL_MC(op_put, op4_put, put_)
VC1_MSPEL_MC(op_avg, op4_avg, avg_)