OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1e6cbb0
)
j2kdec: remove unneeded operation
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 14 Oct 2012 20:13:37 +0000
(22:13 +0200)
committer
Michael 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
patch
|
blob
|
history
diff --git
a/libavcodec/j2kdec.c
b/libavcodec/j2kdec.c
index
4194659
..
de94f51
100644
(file)
--- 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;
}
}