RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced' 

* commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced':
  webpdec: Fix decoding of the huffman group indices.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-04 01:08:35 +02:00
parent b28fcbba0c c6698dfe7c
commit cf8c44fc47
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/webp.c
View File

@ -482,7 +482,9 @@ static int decode_entropy_image(WebPContext *s)
max = 0;
for (y = 0; y < img->frame->height; y++) {
for (x = 0; x < img->frame->width; x++) {
int p = GET_PIXEL_COMP(img->frame, x, y, 2);
int p0 = GET_PIXEL_COMP(img->frame, x, y, 1);
int p1 = GET_PIXEL_COMP(img->frame, x, y, 2);
int p = p0 << 8 | p1;
max = FFMAX(max, p);
}
}
@ -567,7 +569,9 @@ static HuffReader *get_huffman_group(WebPContext *s, ImageContext *img,
if (gimg->size_reduction > 0) {
int group_x = x >> gimg->size_reduction;
int group_y = y >> gimg->size_reduction;
group = GET_PIXEL_COMP(gimg->frame, group_x, group_y, 2);
int g0 = GET_PIXEL_COMP(gimg->frame, group_x, group_y, 1);
int g1 = GET_PIXEL_COMP(gimg->frame, group_x, group_y, 2);
group = g0 << 8 | g1;
}
return &img->huffman_groups[group * HUFFMAN_CODES_PER_META_CODE];