Commit 12e9bf3e authored by Diego Biurrun's avatar Diego Biurrun

flashsvenc: merge variable declarations and initializations

parent b88523c2
...@@ -164,9 +164,7 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf, ...@@ -164,9 +164,7 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf,
int wp = i * block_width; // vertical position in frame int wp = i * block_width; // vertical position in frame
int ws = (i < h_blocks) ? block_width : h_part; // size of block int ws = (i < h_blocks) ? block_width : h_part; // size of block
int ret = Z_OK; int ret = Z_OK;
uint8_t *ptr; uint8_t *ptr = buf + buf_pos;
ptr = buf + buf_pos;
/* copy the block to the temp buffer before compression /* copy the block to the temp buffer before compression
* (if it differs from the previous frame's block) */ * (if it differs from the previous frame's block) */
...@@ -175,11 +173,9 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf, ...@@ -175,11 +173,9 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf,
wp, hs, ws, p->linesize[0], previous_frame); wp, hs, ws, p->linesize[0], previous_frame);
if (res || *I_frame) { if (res || *I_frame) {
unsigned long zsize; unsigned long zsize = 3 * block_width * block_height;
zsize = 3 * block_width * block_height;
ret = compress2(ptr + 2, &zsize, s->tmpblock, 3 * ws * hs, 9); ret = compress2(ptr + 2, &zsize, s->tmpblock, 3 * ws * hs, 9);
//ret = deflateReset(&s->zstream); //ret = deflateReset(&s->zstream);
if (ret != Z_OK) if (ret != Z_OK)
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
...@@ -214,7 +210,7 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, ...@@ -214,7 +210,7 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf,
uint8_t *pfptr; uint8_t *pfptr;
int res; int res;
int I_frame = 0; int I_frame = 0;
int opt_w, opt_h; int opt_w = 4, opt_h = 4;
*p = *pict; *p = *pict;
...@@ -240,9 +236,6 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, ...@@ -240,9 +236,6 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf,
} }
} }
opt_w = 4;
opt_h = 4;
if (buf_size < s->image_width * s->image_height * 3) { if (buf_size < s->image_width * s->image_height * 3) {
//Conservative upper bound check for compressed data //Conservative upper bound check for compressed data
av_log(avctx, AV_LOG_ERROR, "buf_size %d < %d\n", av_log(avctx, AV_LOG_ERROR, "buf_size %d < %d\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment