From bc077ca6b5f8bb3afdc557f29468aed956012d3d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 14 Oct 2012 22:13:37 +0200 Subject: j2kdec: remove unneeded operation Fixes CID717554 Signed-off-by: Michael Niedermayer --- libavcodec/j2kdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 4194659983..de94f51197 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -836,7 +836,7 @@ static int decode_tile(J2kDecoderContext *s, J2kTile *tile) int *ptr = t1.data[y-yy0]; for (x = xx0; x < xx1; x+=s->cdx[compno]){ int tmp = ((int64_t)*ptr++) * ((int64_t)band->stepsize) >> 13, tmp2; - tmp2 = FFABS(tmp>>1) + FFABS(tmp&1); + tmp2 = FFABS(tmp>>1) + (tmp&1); comp->data[(comp->coord[0][1] - comp->coord[0][0]) * y + x] = tmp < 0 ? -tmp2 : tmp2; } } -- cgit v1.2.3