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/jpeglsdec.c | |
| parent | 4390fa6273e603f17a2c7244a5de0d8e36397f59 (diff) | |
| parent | 9cacdabd1c8cd257a942d8289349c37d992989b7 (diff) | |
| download | ffmpeg-0d83b5722e2875cd4a2ac3574af72b5be633c73d.tar.gz | |
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/jpeglsdec.c')
| -rw-r--r-- | libavcodec/jpeglsdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index 516a82fc90..dd971ccc26 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -98,7 +98,7 @@ static inline int ls_get_code_regular(GetBitContext *gb, JLSState *state, int Q) /* decode mapped error */ if(ret & 1) - ret = -((ret + 1) >> 1); + ret = -(ret + 1 >> 1); else ret >>= 1; @@ -136,7 +136,7 @@ static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state, int RI ret += RItype + map; if(ret & 1){ - ret = map - ((ret + 1) >> 1); + ret = map - (ret + 1 >> 1); state->B[Q]++; } else { ret = ret >> 1; @@ -186,7 +186,7 @@ static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s, void * x += stride; } /* if EOL reached, we stop decoding */ - if(r != (1 << ff_log2_run[state->run_index[comp]])) + if (r != 1 << ff_log2_run[state->run_index[comp]]) return; if(state->run_index[comp] < 31) state->run_index[comp]++; |