OSDN Git Service

j2kdec: remove unneeded operation
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Oct 2012 20:13:37 +0000 (22:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Oct 2012 20:16:31 +0000 (22:16 +0200)
Fixes CID717554
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/j2kdec.c

index 4194659..de94f51 100644 (file)
@@ -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;
                                 }
                             }