summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-14 22:13:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-14 22:16:31 +0200
commitbc077ca6b5f8bb3afdc557f29468aed956012d3d (patch)
treeaa99b04f4ad682506ceb0013e0b0ba77214442a6
parent1e6cbb01e9119a731c68be97bec27865b8ba986c (diff)
j2kdec: remove unneeded operation
Fixes CID717554 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/j2kdec.c2
1 files changed, 1 insertions, 1 deletions
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;
}
}