diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:19:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:19:11 +0200 |
| commit | 0d83b5722e2875cd4a2ac3574af72b5be633c73d (patch) | |
| tree | 4d42d5d60b334b4cbe13188c97005c7634d58135 /libavcodec/jpeglsenc.c | |
| parent | 4390fa6273e603f17a2c7244a5de0d8e36397f59 (diff) | |
| parent | 9cacdabd1c8cd257a942d8289349c37d992989b7 (diff) | |
Merge commit '9cacdabd1c8cd257a942d8289349c37d992989b7'
* commit '9cacdabd1c8cd257a942d8289349c37d992989b7':
jpegls: cosmetics: Drop some unnecessary parentheses
mpegvideo: Remove commented-out PARANOID debug cruft
Conflicts:
libavcodec/jpegls.c
libavcodec/mpegvideo.c
libavcodec/x86/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsenc.c')
| -rw-r--r-- | libavcodec/jpeglsenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index be979aa371..c966af6708 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -49,7 +49,7 @@ static inline void ls_encode_regular(JLSState *state, PutBitContext *pb, int Q, if(err < 0) err += state->range; - if(err >= ((state->range + 1) >> 1)) { + if (err >= (state->range + 1 >> 1)) { err -= state->range; val = 2 * FFABS(err) - 1 - map; } else @@ -145,7 +145,7 @@ static inline void ls_encode_line(JLSState *state, PutBitContext *pb, void *last if(x >= w) return; Rb = R(last, x); - RItype = (FFABS(Ra - Rb) <= state->near); + RItype = FFABS(Ra - Rb) <= state->near; pred = RItype ? Ra : Rb; err = R(cur, x) - pred; @@ -166,7 +166,7 @@ static inline void ls_encode_line(JLSState *state, PutBitContext *pb, void *last } if(err < 0) err += state->range; - if(err >= ((state->range + 1) >> 1)) + if (err >= state->range + 1 >> 1) err -= state->range; ls_encode_runterm(state, pb, RItype, err, ff_log2_run[state->run_index[comp]]); |