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-09 01:50:05 +0200
commit6a679279f7f27a897cae314967427325bf53138a (patch)
tree854aa72a7b35f7459e0676e57ba4d056e442f1c3
parentdd8464bc99515dc4a38d5f86320e2ae64b589952 (diff)
downloadffmpeg-6a679279f7f27a897cae314967427325bf53138a.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 929235103d..9aee5956c1 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1111,7 +1111,7 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss,
return AVERROR_INVALIDDATA;
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];
}