X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Flclenc.c;h=4c43916fd195220484bee573cf8e83fb5d4059da;hb=a3d995c1eb98e38186bf9ed677809c442a7dab35;hp=5385a84e8ad4769c45cbd97ef2c098c25fccec73;hpb=e786d3cf8023414babcc9f1d3a8fdd5a29c3fd70;p=ffmpeg diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c index 5385a84e8ad..4c43916fd19 100644 --- a/libavcodec/lclenc.c +++ b/libavcodec/lclenc.c @@ -42,7 +42,6 @@ #include #include "avcodec.h" -#include "put_bits.h" #include "lcl.h" #include @@ -54,7 +53,6 @@ typedef struct LclEncContext { AVCodecContext *avctx; AVFrame pic; - PutBitContext pb; // Image type int imgtype; @@ -62,12 +60,6 @@ typedef struct LclEncContext { int compression; // Flags int flags; - // Decompressed data size - unsigned int decomp_size; - // Maximum compressed data size - unsigned int max_comp_size; - // Compression buffer - unsigned char* comp_buf; z_stream zstream; } LclEncContext; @@ -142,7 +134,6 @@ static av_cold int encode_init(AVCodecContext *avctx) switch(avctx->pix_fmt){ case PIX_FMT_BGR24: c->imgtype = IMGTYPE_RGB24; - c->decomp_size = avctx->width * avctx->height * 3; avctx->bits_per_coded_sample= 24; break; default: @@ -150,14 +141,14 @@ static av_cold int encode_init(AVCodecContext *avctx) return -1; } - ((uint8_t*)avctx->extradata)[0]= 4; - ((uint8_t*)avctx->extradata)[1]= 0; - ((uint8_t*)avctx->extradata)[2]= 0; - ((uint8_t*)avctx->extradata)[3]= 0; - ((uint8_t*)avctx->extradata)[4]= c->imgtype; - ((uint8_t*)avctx->extradata)[5]= c->compression; - ((uint8_t*)avctx->extradata)[6]= c->flags; - ((uint8_t*)avctx->extradata)[7]= CODEC_ZLIB; + avctx->extradata[0]= 4; + avctx->extradata[1]= 0; + avctx->extradata[2]= 0; + avctx->extradata[3]= 0; + avctx->extradata[4]= c->imgtype; + avctx->extradata[5]= c->compression; + avctx->extradata[6]= c->flags; + avctx->extradata[7]= CODEC_ZLIB; c->avctx->extradata_size= 8; c->zstream.zalloc = Z_NULL; @@ -182,7 +173,6 @@ static av_cold int encode_end(AVCodecContext *avctx) LclEncContext *c = avctx->priv_data; av_freep(&avctx->extradata); - av_freep(&c->comp_buf); deflateEnd(&c->zstream); return 0;