1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

avcodec/flashsvenc: Remove unused z_stream

This encoder uses the compress2 utility function provided by zlib
instead of using a z_stream.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-09-14 16:37:58 +02:00
parent ec6f4c5158
commit d1487659ee

View File

@ -61,7 +61,6 @@ typedef struct FlashSVContext {
int block_width, block_height;
uint8_t *encbuffer;
int block_size;
z_stream zstream;
int last_key_frame;
uint8_t tmpblock[3 * 256 * 256];
} FlashSVContext;
@ -92,8 +91,6 @@ static av_cold int flashsv_encode_end(AVCodecContext *avctx)
{
FlashSVContext *s = avctx->priv_data;
deflateEnd(&s->zstream);
av_freep(&s->encbuffer);
av_freep(&s->previous_frame);
@ -112,9 +109,6 @@ static av_cold int flashsv_encode_init(AVCodecContext *avctx)
return AVERROR_INVALIDDATA;
}
// Needed if zlib unused or init aborted before deflateInit
memset(&s->zstream, 0, sizeof(z_stream));
s->last_key_frame = 0;
s->image_width = avctx->width;
@ -180,7 +174,6 @@ static int encode_bitstream(FlashSVContext *s, const AVFrame *p, uint8_t *buf,
ret = compress2(ptr + 2, &zsize, s->tmpblock,
3 * cur_blk_width * cur_blk_height, 9);
//ret = deflateReset(&s->zstream);
if (ret != Z_OK)
av_log(s->avctx, AV_LOG_ERROR,
"error while compressing block %dx%d\n", i, j);