aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-27 05:32:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-10 21:55:41 +0200
commitcb0d255e2fc548c8fbb50ba13fc1402a9f36783a (patch)
tree3032543b4057e2c13b0f0a71614ef1d4fa30c496
parentd2ceca6e8bf0f4fdacc70c99c8283cb6779556f8 (diff)
downloadffmpeg-cb0d255e2fc548c8fbb50ba13fc1402a9f36783a.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 be85fc55a0..1608b4f9e2 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1140,7 +1140,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];
}