diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-02-28 18:10:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-02-28 18:46:35 +0100 |
| commit | c6f4720b8664e6e22eb5b3da6bb48ed5b113f746 (patch) | |
| tree | c1f0ccb4c703dc1cc8e3383a73f211ae60cbeed6 /libavcodec | |
| parent | bbf7500df99c52e5cecfbe32fbd0b682b6b28fac (diff) | |
| download | ffmpeg-streaming-c6f4720b8664e6e22eb5b3da6bb48ed5b113f746.zip ffmpeg-streaming-c6f4720b8664e6e22eb5b3da6bb48ed5b113f746.tar.gz | |
avcodec/mjpegdec: Fix decoding slightly odd progressive jpeg
Fixes: ebd58db6-dc86-11e5-91c2-59daeddf50c7.jpg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegdec.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index bd7fb94..f41f3a5 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1381,12 +1381,10 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss, return AVERROR_INVALIDDATA; } - 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]; - } + // 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 = !Al && !~s->coefs_finished[c]; if (s->interlaced && s->bottom_field) data += linesize >> 1; |
