diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-27 05:32:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-25 16:35:24 +0200 |
| commit | d9d66d2d16fab53457fc374280ca00f24345c34d (patch) | |
| tree | 1ca2be310cb927abee3ad5f8fc3eaddfb9b1d6b3 | |
| parent | db33fb1c4866459fd3b48c844ea691b5118d63af (diff) | |
| download | ffmpeg-d9d66d2d16fab53457fc374280ca00f24345c34d.tar.gz | |
avcodec/mjpegdec: Fix undefined shift
Fixes CID1194388
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b4329605289e25bb071ec1c1182bf25fc83b09aa)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 03cd065810..6a61315efc 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1151,7 +1151,7 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss, } if (!Al) { - s->coefs_finished[c] |= (1LL << (se + 1)) - (1LL << ss); + s->coefs_finished[c] |= (2LL << se) - (1LL << ss); last_scan = !~s->coefs_finished[c]; } |