aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpegdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-28 00:16:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-28 00:22:38 +0200
commite31727bd53fc69ace0373deabf48360ac6af94ec (patch)
tree97f8d0d126cded376c9002feaea984c0cc43047f /libavcodec/mjpegdec.c
parent4260ed462b4ca92e90fb13006b7b5db8010a32d0 (diff)
downloadffmpeg-e31727bd53fc69ace0373deabf48360ac6af94ec.tar.gz
avcodec/mjpegdec: make type of shift unsigned to avoid undefined behavior
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r--libavcodec/mjpegdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index df1ce1e2b8..6b1a03b9c8 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1272,7 +1272,7 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss,
}
if (!Al) {
- s->coefs_finished[c] |= (2LL << se) - (1LL << ss);
+ s->coefs_finished[c] |= (2ULL << se) - (1ULL << ss);
last_scan = !~s->coefs_finished[c];
}