summaryrefslogtreecommitdiff
path: root/libavcodec/jpegls.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-05-15 19:55:09 +0200
committerDiego Biurrun <diego@biurrun.de>2013-05-15 23:58:04 +0200
commit9cacdabd1c8cd257a942d8289349c37d992989b7 (patch)
tree56ac64e557597ab414a966972b067ac43a5948e5 /libavcodec/jpegls.c
parent004b81c465d5bad63e72cdaa923429696e899caa (diff)
jpegls: cosmetics: Drop some unnecessary parentheses
Diffstat (limited to 'libavcodec/jpegls.c')
-rw-r--r--libavcodec/jpegls.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/jpegls.c b/libavcodec/jpegls.c
index 4740f11e05..bbe1a04e56 100644
--- a/libavcodec/jpegls.c
+++ b/libavcodec/jpegls.c
@@ -31,7 +31,7 @@ void ff_jpegls_init_state(JLSState *state){
int i;
state->twonear = state->near * 2 + 1;
- state->range = ((state->maxval + state->twonear - 1) / state->twonear) + 1;
+ state->range = (state->maxval + state->twonear - 1) / state->twonear + 1;
// QBPP = ceil(log2(RANGE))
for(state->qbpp = 0; (1 << state->qbpp) < state->range; state->qbpp++);
@@ -39,10 +39,10 @@ void ff_jpegls_init_state(JLSState *state){
if(state->bpp < 8)
state->limit = 16 + 2 * state->bpp - state->qbpp;
else
- state->limit = (4 * state->bpp) - state->qbpp;
+ state->limit = 4 * state->bpp - state->qbpp;
for(i = 0; i < 367; i++) {
- state->A[i] = FFMAX((state->range + 32) >> 6, 2);
+ state->A[i] = FFMAX(state->range + 32 >> 6, 2);
state->N[i] = 1;
}
@@ -65,7 +65,7 @@ void ff_jpegls_reset_coding_parameters(JLSState *s, int reset_all){
if(s->maxval==0 || reset_all) s->maxval= (1 << s->bpp) - 1;
if(s->maxval >=128){
- factor= (FFMIN(s->maxval, 4095) + 128)>>8;
+ factor = FFMIN(s->maxval, 4095) + 128 >> 8;
if(s->T1==0 || reset_all)
s->T1= iso_clip(factor*(basic_t1-2) + 2 + 3*s->near, s->near+1, s->maxval);