aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pngdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-25 19:24:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-25 19:25:10 +0200
commitc163f5e601ca2f948ef1050eafecc0ee4f0e58a6 (patch)
tree68acc3016e4272b7207fad00d78557a460deba23 /libavcodec/pngdec.c
parentad733089b024e4a3ff8f024d247a032f79a50ac8 (diff)
downloadffmpeg-c163f5e601ca2f948ef1050eafecc0ee4f0e58a6.tar.gz
avcodec/pngdec: fix () in OP_* macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pngdec.c')
-rw-r--r--libavcodec/pngdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index fd771fc946..c92087f5e8 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -237,7 +237,7 @@ static void png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type,
*(int *)(dst + i) = p;
}
} else {
-#define OP_SUB(x, s, l) x + s
+#define OP_SUB(x, s, l) ((x) + (s))
UNROLL_FILTER(OP_SUB);
}
break;
@@ -249,7 +249,7 @@ static void png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type,
p = (last[i] >> 1);
dst[i] = p + src[i];
}
-#define OP_AVG(x, s, l) (((x + l) >> 1) + s) & 0xff
+#define OP_AVG(x, s, l) (((((x) + (l)) >> 1) + (s)) & 0xff)
UNROLL_FILTER(OP_AVG);
break;
case PNG_FILTER_VALUE_PAETH: