aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-27 05:32:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-23 15:14:40 +0200
commit2277706b35814fb8750664d182c030c6e80e703e (patch)
tree0b252e2a5dc6d830107b39f9fa6862a07519527e
parent6b0c1ed11608d7b91606d23331808795dcfa91b3 (diff)
downloadffmpeg-2277706b35814fb8750664d182c030c6e80e703e.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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 4d347af913..02ad11806d 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1109,7 +1109,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];
}