*/
/**
- * @file libavcodec/lcldec.c
+ * @file
* LCL (LossLess Codec Library) Video Codec
* Decoder for MSZH and ZLIB codecs
* Experimental encoder for ZLIB RGB24
unsigned ofs = bytestream_get_le16(&srcptr);
unsigned cnt = (ofs >> 11) + 1;
ofs &= 0x7ff;
+ ofs = FFMIN(ofs, destptr - destptr_bak);
cnt *= 4;
cnt = FFMIN(cnt, destptr_end - destptr);
av_memcpy_backptr(destptr, ofs, cnt);
maskbit >>= 1;
if (!maskbit) {
mask = *srcptr++;
+ while (!mask) {
+ if (destptr_end - destptr < 32 || srcptr_end - srcptr < 32) break;
+ memcpy(destptr, srcptr, 32);
+ destptr += 32;
+ srcptr += 32;
+ mask = *srcptr++;
+ }
maskbit = 0x80;
}
}
}
+#if CONFIG_ZLIB_DECODER
/**
* \brief decompress a zlib-compressed data block into decomp_buf
* \param src compressed input buffer
}
return c->zstream.total_out;
}
+#endif
/*
return 1;
}
- if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
- return 1;
- }
-
/* Check codec type */
if ((avctx->codec_id == CODEC_ID_MSZH && avctx->extradata[7] != CODEC_MSZH) ||
(avctx->codec_id == CODEC_ID_ZLIB && avctx->extradata[7] != CODEC_ZLIB)) {
zret = inflateInit(&c->zstream);
if (zret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
+ av_freep(&c->decomp_buf);
return 1;
}
}
{
LclDecContext * const c = avctx->priv_data;
+ av_freep(&c->decomp_buf);
if (c->pic.data[0])
avctx->release_buffer(avctx, &c->pic);
#if CONFIG_ZLIB_DECODER
}
#if CONFIG_MSZH_DECODER
-AVCodec mszh_decoder = {
+AVCodec ff_mszh_decoder = {
"mszh",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_MSZH,
sizeof(LclDecContext),
decode_init,
#endif
#if CONFIG_ZLIB_DECODER
-AVCodec zlib_decoder = {
+AVCodec ff_zlib_decoder = {
"zlib",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_ZLIB,
sizeof(LclDecContext),
decode_init,