Skip to content

Commit

Permalink
flashsv2enc: move blockbuffer realloc to reconfigure_at_keyframe()
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  • Loading branch information
michaelni committed Sep 7, 2012
1 parent 9b6467f commit dbb9117
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions libavcodec/flashsv2enc.c
Expand Up @@ -554,16 +554,9 @@ static int encode_block(FlashSV2Context *s, Palette * palette, Block * b,
int dist, int keyframe)
{
unsigned buf_size = b->width * b->height * 6;
uint8_t *buf;
uint8_t *buf = s->blockbuffer;
int res;

av_fast_malloc(&s->blockbuffer, &s->blockbuffer_size, buf_size);
if (!s->blockbuffer) {
av_log(s->avctx, AV_LOG_ERROR, "Could not allocate block buffer.\n");
return AVERROR(ENOMEM);
}
buf = s->blockbuffer;

if (b->flags & COLORSPACE_15_7) {
encode_15_7(palette, b, src, stride, dist);
} else {
Expand Down Expand Up @@ -826,6 +819,11 @@ static int reconfigure_at_keyframe(FlashSV2Context * s, const uint8_t * image,
init_blocks(s, s->frame_blocks, s->encbuffer, s->databuffer);
init_blocks(s, s->key_blocks, s->keybuffer, 0);

av_fast_malloc(&s->blockbuffer, &s->blockbuffer_size, block_width * block_height * 6);
if (!s->blockbuffer) {
av_log(s->avctx, AV_LOG_ERROR, "Could not allocate block buffer.\n");
return AVERROR(ENOMEM);
}
}

s->use15_7 = optimum_use15_7(s);
Expand Down

0 comments on commit dbb9117

Please sign in to comment.