diff options
Diffstat (limited to 'libavcodec/lcl.c')
| -rw-r--r-- | libavcodec/lcl.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/lcl.c b/libavcodec/lcl.c index b93f314489..9f0bd45916 100644 --- a/libavcodec/lcl.c +++ b/libavcodec/lcl.c @@ -152,7 +152,7 @@ static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned cha unsigned char mask = 0; unsigned char maskbit = 0; unsigned int ofs, cnt; - + while ((srclen > 0) && (destptr < destptr_end)) { if (maskbit == 0) { mask = *(srcptr++); @@ -290,7 +290,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 c->zstream.next_in = encoded + 8; c->zstream.avail_in = mthread_inlen; c->zstream.next_out = c->decomp_buf; - c->zstream.avail_out = c->decomp_size; + c->zstream.avail_out = c->decomp_size; zret = inflate(&(c->zstream), Z_FINISH); if ((zret != Z_OK) && (zret != Z_STREAM_END)) { av_log(avctx, AV_LOG_ERROR, "Mthread1 inflate error: %d\n", zret); @@ -309,7 +309,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 c->zstream.next_in = encoded + 8 + mthread_inlen; c->zstream.avail_in = len - mthread_inlen; c->zstream.next_out = c->decomp_buf + mthread_outlen; - c->zstream.avail_out = c->decomp_size - mthread_outlen; + c->zstream.avail_out = c->decomp_size - mthread_outlen; zret = inflate(&(c->zstream), Z_FINISH); if ((zret != Z_OK) && (zret != Z_STREAM_END)) { av_log(avctx, AV_LOG_ERROR, "Mthread2 inflate error: %d\n", zret); @@ -565,11 +565,11 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, #else init_put_bits(&c->pb, buf, buf_size); - + *p = *pict; p->pict_type= FF_I_TYPE; p->key_frame= 1; - + if(avctx->pix_fmt != PIX_FMT_BGR24){ av_log(avctx, AV_LOG_ERROR, "Format not supported!\n"); return -1; @@ -628,7 +628,7 @@ static int decode_init(AVCodecContext *avctx) #ifdef CONFIG_ZLIB // Needed if zlib unused or init aborted before inflateInit - memset(&(c->zstream), 0, sizeof(z_stream)); + memset(&(c->zstream), 0, sizeof(z_stream)); #endif if (avctx->extradata_size < 8) { @@ -640,7 +640,7 @@ static int decode_init(AVCodecContext *avctx) return 1; } - /* Check codec type */ + /* Check codec type */ if (((avctx->codec_id == CODEC_ID_MSZH) && (*((char *)avctx->extradata + 7) != CODEC_MSZH)) || ((avctx->codec_id == CODEC_ID_ZLIB) && (*((char *)avctx->extradata + 7) != CODEC_ZLIB))) { av_log(avctx, AV_LOG_ERROR, "Codec id and codec type mismatch. This should not happen.\n"); @@ -736,8 +736,8 @@ static int decode_init(AVCodecContext *avctx) return 1; } } - - /* Detect flags */ + + /* Detect flags */ c->flags = *((char *)avctx->extradata + 6); if (c->flags & FLAG_MULTITHREAD) av_log(avctx, AV_LOG_INFO, "Multithread encoder flag set.\n"); @@ -788,9 +788,9 @@ static int encode_init(AVCodecContext *avctx) #else c->avctx= avctx; - + assert(avctx->width && avctx->height); - + avctx->extradata= av_mallocz(8); avctx->coded_frame= &c->pic; @@ -818,7 +818,7 @@ static int encode_init(AVCodecContext *avctx) ((uint8_t*)avctx->extradata)[6]= c->flags; ((uint8_t*)avctx->extradata)[7]= CODEC_ZLIB; c->avctx->extradata_size= 8; - + c->zstream.zalloc = Z_NULL; c->zstream.zfree = Z_NULL; c->zstream.opaque = Z_NULL; @@ -878,7 +878,7 @@ static int encode_end(AVCodecContext *avctx) #ifdef CONFIG_ZLIB deflateEnd(&(c->zstream)); #endif - + return 0; } |