dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 06:08:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "libwebp: fix vp8 encoder mem alloc offsetting"

Browse Source
This commit is contained in:
pascal massimino 2013-05-15 00:41:14 -07:00 committed by Gerrit Code Review
commit d5f9b8f383
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/enc/webpenc.c
View File

@ -243,8 +243,7 @@ static VP8Encoder* InitVP8Encoder(const WebPConfig* const config,
mem += info_size; mem += info_size;
enc->preds_ = ((uint8_t*)mem) + 1 + enc->preds_w_; enc->preds_ = ((uint8_t*)mem) + 1 + enc->preds_w_;
mem += preds_w * preds_h * sizeof(uint8_t); mem += preds_w * preds_h * sizeof(uint8_t);
mem = (uint8_t*)DO_ALIGN(mem); enc->nz_ = 1 + (uint32_t*)DO_ALIGN(mem);
enc->nz_ = 1 + (uint32_t*)mem;
mem += nz_size; mem += nz_size;
enc->lf_stats_ = lf_stats_size ? (LFStats*)DO_ALIGN(mem) : NULL; enc->lf_stats_ = lf_stats_size ? (LFStats*)DO_ALIGN(mem) : NULL;
mem += lf_stats_size; mem += lf_stats_size;
@ -261,6 +260,7 @@ static VP8Encoder* InitVP8Encoder(const WebPConfig* const config,
mem += 16; mem += 16;
enc->v_left_ = (uint8_t*)mem; enc->v_left_ = (uint8_t*)mem;
mem += 8; mem += 8;
assert(mem <= (uint8_t*)enc + size);
enc->config_ = config; enc->config_ = config;
enc->profile_ = use_filter ? ((config->filter_type == 1) ? 0 : 1) : 2; enc->profile_ = use_filter ? ((config->filter_type == 1) ? 0 : 1) : 2;