diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 18:36:19 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-21 20:43:38 +0200 |
commit | 4c6224b1cde6c71d8e33718db1b41384ddfcb3a5 (patch) | |
tree | a3d93971a52cdce0ed770db5b48c7a0b0b4e3e32 /libavcodec | |
parent | bf2254bffd50d4bfcd5bb1373662d72fedc2f54c (diff) | |
download | ffmpeg-4c6224b1cde6c71d8e33718db1b41384ddfcb3a5.tar.gz |
avcodec/mjpegdec: fix len computation in ff_mjpeg_decode_dqt()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 81cf9108563510dee24f73b2c5d94a7bd07ff747)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index bf674581d3..af38364e78 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -182,7 +182,7 @@ int ff_mjpeg_decode_dqt(MJpegDecodeContext *s) s->quant_matrixes[index][s->scantable.permutated[8]]) >> 1; av_log(s->avctx, AV_LOG_DEBUG, "qscale[%d]: %d\n", index, s->qscale[index]); - len -= 65; + len -= 1 + 64 * (1+pr); } return 0; } |