Fixes: Ticket 10239
Fixes: zlib_306_306_rgb24.av
Signed-off-by: Michael Niedermayer <[email protected]>
---
libavcodec/lcldec.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index f9a0755e4d..eb5139a5c5 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -152,6 +152,8 @@ static int zlib_decomp(AVCodecContext *avctx, const uint8_t
*src, int src_len, i
if (expected != (unsigned int)zstream->total_out) {
av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %lu)\n",
expected, zstream->total_out);
+ if (expected > (unsigned int)zstream->total_out)
+ return (unsigned int)zstream->total_out;
return AVERROR_UNKNOWN;
}
return zstream->total_out;
@@ -278,12 +280,13 @@ static int decode_frame(AVCodecContext *avctx, AVFrame
*frame,
ret = zlib_decomp(avctx, buf + 8 + mthread_inlen, len - 8 -
mthread_inlen,
mthread_outlen, mthread_outlen);
if (ret < 0) return ret;
+ len = c->decomp_size;
} else {
int ret = zlib_decomp(avctx, buf, len, 0, c->decomp_size);
if (ret < 0) return ret;
+ len = ret;
}
encoded = c->decomp_buf;
- len = c->decomp_size;
break;
#endif
default:
@@ -521,7 +524,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
partial_h_supported = 1;
break;
case IMGTYPE_RGB24:
- c->decomp_size = basesize * 3;
+ c->decomp_size = FFALIGN(avctx->width*3, 4) * avctx->height;
max_decomp_size = max_basesize * 3;
avctx->pix_fmt = AV_PIX_FMT_BGR24;
av_log(avctx, AV_LOG_DEBUG, "Image type is RGB 24.\n");
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
