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-05-05 00:09:17 +0200
commit2d18e7f3ef05532aac8aa4d455b6b1b5a1377456 (patch)
tree9e8ae536816d1d0778f460338bd7472be9ac06d6 /libavcodec
parentf1b5830182086905c412042f34ede7782dde9919 (diff)
downloadffmpeg-2d18e7f3ef05532aac8aa4d455b6b1b5a1377456.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 cb8f2b9660..2c79da533c 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1251,7 +1251,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];
}