Commit c53a1507 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '199d9f99'

* commit '199d9f99':
  mjpegdec: fix undefined shift

Conflicts:
	libavcodec/mjpegdec.c

See: b4329605Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ad0cf8e0 199d9f99
......@@ -1295,6 +1295,8 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss,
}
if (!Al) {
// s->coefs_finished is a bitmask for coefficients coded
// ss and se are parameters telling start and end coefficients
s->coefs_finished[c] |= (2ULL << se) - (1ULL << ss);
last_scan = !~s->coefs_finished[c];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment