aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
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 18:17:42 +0200
commit0607c8af2bd108410c0882dd96533c6ceaef617a (patch)
tree6f79db9cbfa68b355e7fb8f8669275c5ea77f378 /libavcodec
parent3c385ea24cb68a9c6679a402db6cf15b88b515f5 (diff)
downloadffmpeg-0607c8af2bd108410c0882dd96533c6ceaef617a.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>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mjpegdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 27b0e5bff1..b9c6950b1a 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1144,7 +1144,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];
}